My advice: rescind. You aren't happy with what you are buying. But, my next advice is: You should buy RIV direct. That's the one you want, so that's the one you should buy.
The resale restrictions do not matter to you, because you are not buying it resale. You might lose a little value on the back end, but that's probably a couple decades from now. The market does not seem to be penalizing RIV more than marginally. And, a couple of decades from now is after 2042, where the Original 14 become the Original Eight And A Half. At that point, I think the "restriction penalty" is going to be even smaller than it is today for valuing a
DVC resale deed. At that point, resale owners will be completely shut out of the Epcot area unless they buy at one of those resorts. And, RIV is one of those resorts.
I'm a big dollars-and-cents guy, and am usually the first to jump on the all-resale all-the-time bandwagon. Heck, I'm the guy who might tell you to buy a non-Disney timeshare because DVC doesn't make sense.
But I also think that buying a timeshare is more about changing your lifestyle than it is saving money. I mean, sure you probably can save some money here and there, but that's not really the point. Buying RIV means (a) you will be able to stay at your preferred resort and (b) never having to worry about restrictions. And, the calendar is moving to a point where everyone is going to have to start thinking about what restrictions mean for them before too many more years pass.