This goes along with your 2nd tip, but don’t use the Riviera station at peak times. Going to Epcot in the morning? The station gets backed up and very few empty cabins coming from CBR. At night, very few cabins left empty coming from Epcot, making a trip to CBR or Aoa/Pop difficult.
the gondola comes into the station fast, then slows down really quick. Kinda frightening how close it feels to crashing.