Update: OP here - after much deliberation and many sleepless nights (literally), I've decided to move ahead with Riviera. Ultimately I decided that I value the longer expiration date + ability to book all resorts + relative proximity to IG. If I didn't already have a BWV contract, I may have leaned in this direction but Riviera gets me close enough to the park I love the most regardless of what happens post 2042. Plus - as my young DD pointed out - she wants to stay at Riviera for the pizza
I opted for two FWs, one of which is 153 points, so even down the road if I needed to/wanted to sell the other FW, I would still be able to maintain blue card.
I want to again thank everyone for helping me think through this decision. Since I joined these boards several months ago, I have been blown away by the generosity of you all in sharing your knowledge and experiences.