Personally, I'd stick with BCV. I stayed there last week and Storm-a-long Bay was absolutely perfect. If you and your husband are just interested in the hot tub, the Beach Club HOTEL pool (and the Villas pool) are still open and I never saw a single person there, so the hot tub was always free. I visited Wilderness Lodge once during my trip and the pools were busy at that time.
For the Rise of the resistance boarding group, even if you don't get the 7am pass, go and tap into Hollywood Studios anyway. As long as you tap in, it will let you try for the 2pm boarding group whether you're in the park or not. I personally got a 2pm boarding group assignment while floating in Storm-a-long Bay's lazy river.