Since you asked what would we do, I'm in the Riviera camp. My reasoning as follows:
I, like you, already own at VGF and have our welcome home trip in a few weeks. It's intended to test the waters for the "family" which is the intended purpose. I'm freshly retired as is my SO but we are not Disney fanatics. I like Disney and expect to visit every other year even if it's just us. The bigger justification is the rest of the clan. Three of my children and their spouses along with 2 grandchildren <3 years old as well as ex are going for a total of 11 people. I mention this as a back story to how I see our future potentially dictating my next move.
Those 3 children are all on the deed (fourth child has no interest and lives 2 hours from the rest of us), one of which is a former CM. My son with the grandchildren is not as smitten with Disney but having kids has him more invested in giving it a go. His wife is all aboard and the ex is too. We honeymooned at Disney in 1985 and with grandchildren, she can see this being a regular thing. She's already started to ask about
DVC specifics (as a side note, I stopped at a DVC kiosk in 1992ish when we returned with our first 2 kids and found it intriguing but time and money kept it on the back burner for 30 years) so I expect when we get back, she may be seriously getting her own contract. So back to why Riviera.
The restrictions have always been a turn-off for me but when I weigh some of the other perks that Riviera offers, I can swallow that pill easier. For our personal use, having a MK resort isn't as important as an Epcot resort. The monorail scratches that itch somewhat but if I was to buy another contract, having another monorail, MK resort doesn't give me anything I don't already have. If I expect to appreciate the Epcot/HS amenities more than MK, my choices are 2042 expiration resorts which I'm reluctant to buy as I expect they will soon be a depreciating asset. As much as I've been trying to base decisions on selfish wants rather than value, it's not always easy to make that personality change overnight. Riviera though, has a long, long contract so unless BW, BC, offer extended expirations, Riviera has the advantage.
In a perfect world, I can ultimately see having a contract in the three areas, Animal Kingdom, MK, and Epcot along with Wilderness Lodge to cover all bases. If our trip results in Pixie Dust intoxication, Riviera could be my next contract.