I think your ok...I would bring a lens that goes to 300+ just in case...and your laptop...so you can download your pictures off the cards...couple other tid-bits...and probably goes without saying...
Have your main Bag then have a walk-around bag...I use a Fossil Mesanger...that does not look like a camera bag...bring a small mono-pod that can fit inside your walk around bag...(will also double as a walking stick if you need it..

)...go pick-up some of those lens holders the fabric ones from Ritz/Wolf Camara for about $7 each...to hold your lenses...take your charger or buy a slimline one from a store...
Best of all take lots of pictures...

...and have fun...!!!
I always bring way too much stuff...but seem to always use it all...!!!