Hoping you will make it! Looking forward to your trip report!
Had to cancel my Disneyland trip for March 23 and looking like my April 30th trip to WDW will be canceled too. Glad I have a November trip planned. Staying at Boardwalk after reading one of your previous trip reports.
I agree about the lobby at Riviera, it's too small. Unfortunately, I think that's how Disney is now going to construct the new hotels. I much prefer the grand lobbies of Wilderness Lodge, Grand Floridian, Contemporary, Poly, etc.