Hands-down, Grand Floridian. The rooms at RIV are beautiful, but the pool is pretty boring and there are limited food options. If the Skyliner goes down, your one transportation "perk" is gone. When staying at GF, you have a ton of dining options, including those at Poly which is a short walk away (and CR on the monorail), the ability to walk, boat or monorail to MK and monorail (via TTC) to EP. You also have better pools, IMHO, to choose from. We've stayed at both and, as I said, RIV is lovely, but when the Skyliner went down, we felt a bit trapped. I actually don't think we'll stay at RIV again. If we want to be in the EP area, we'll stick with BC/YC, BWI, Swan or Dolphin.