I ended up riding the shortened D&S trip -- a bit steep on the price, but still a good experience. I was a bit uncomfortable with the number of people not taking the mask regulations seriously; at least I was on an open car.
Worth mentioning Kylah, who went above and beyond dealing with guest questions on the car I was riding.