Currently we (2 adults and a 6 year old) are booked to stay at Boulder Ridge in a 1 bedroom in August. We've stayed here before and loved it and really enjoyed the boat to Magic Kingdom. But since booking I have been concerned with the fact that the villas are in need of a refurb and don't want to be disappointed with the room. Therefore I am considering switching us to Riviera. We've never been to Riviera, but it does looks lovely and has the skyliner. Riviera is about $1,000 more than Boulder Ridge, so not sure if we should just stick to Boulder Ridge or switch to Riviera. Would love to hear opinions on which you would stay at.