Sounds like a great trip.

Nit pick - this is not true "There is now a five day window to do this test regardless if you’re flying or taking the ferry from the BVI"

It is still within three days of travel if flying, within five days of travel if by water (ferry or water taxi). Sometimes they miss it but better to not risk it.