As you're going up the channel to Anegada you'll pass between the "Dog" islands. Seal Dog Rock was a great pinnacle dive and there's others in that area as well. The Ledges off George Dog and Chimney off Great Dog were also good dives. I'd stop there before the Baths, otherwise you have to double back later.
The diving isn't much at the Baths, snorkeling is usually only done there. A good shallow site nearby is Aquarium Rocks.
Then head down along the islands, Ginger, Cooper, Salt, Norman, all have multiple good dive sites. The Rhone wreck is off Salt Island, that's the signature wreck in that area. "The Deep" was filmed there. Easy swimthrough in the front and the back has a lot of interesting stuff leading to a massive prop. Two separate dives, move to the other mooring between dives.
There used to be a great beach BBQ at Leverick Bay (North Sound, Virgin Gorda) on Friday night, it's a yacht harbor so easily accessed.
:: Leverick Bay ::
And you've got to stop by the Willy T. off Norman Island.
The Willy T - Norman Island, BVI
Both DiveBVI and at least one of the Tortola shops do Rendezvous diving. They'll meet you at a nearby mooring with
tanks, weights, DM etc. - you call them on the radio when you're enroute.
http://www.divebvi.com/scuba-diving/rendezvous-diving/ If you do rent tanks, you can get fills at both their shops in the Yacht Harbor or Leverick Bay conveniently - fill stations are right on the dock. If you need something, they have a well-equipped store at the Yacht Harbor location. Just the best people also, [user]VGDiver[/user] (Jeff) here is their GM.