Talk to your captain about desires for amount of sail time vs stops along the way.... short stops (1hr or so vs longer)...

I would probably add a day getting up to Leverick and then go from there to JVD..

Email me and I will send you PDF of article I just read about "best snorkel sites in BVI".

On the way home, start planning a longer trip to do the things you wish you had done/see/been.

Some favorite restaurants are Sydney's Peace and Love, Harris's Place, Anegada (everywhere).
My favorite is grilling in anchorage with stake, burgers, fish, etc.