Personally, I think the Baths is much more fun by car. It is a whole different experience (have breakfast at top of the baths before heading down) and you get to see a lot more and take your time (there is a 90 minute time limit on the moorings - even though many ignore it - 2 hours is reasonable if things are full).

I'd also avoid Savannah bay if the water is churned up at all - you really need good visibility going in there. It is actually a great stop while touring virgin gorda.

Tuesday the 6th you might be trying to fit a little too much in.. especially if the stop at Brewer's Bay is for a dive. With a good size group, a stop always takes us longer then you'd think.

Another thing to keep in mind is topping up on water. Without making a stop specifically for it, your first chance for water isn't until Thursday. There are places you could certainly go that aren't much out of the way, but it is something to think about.

When you'll need water, really depends on how many people on the boat and how much they conserve. If you have your own dive gear and will snorkel and otherwise be in and out of the water a lot, expect usage to be higher as you rinse gear and rinse yourself off.