The one thing I'd check on is where to fill up the tanks and make sure they are open.

I'd also go right to Leverick after the rendezvous dive. Rent a car and check out Coco Maya (if open) or another restaurant. The next morning take the car to the Baths. We've often done breakfast at the top of the baths and then explored the baths and headed back and then headed out. I'd then spend the night around Marina Cay and do only one night at JVD. You could probably get another dive in there somewhere too.