I find Shanghai nicer for a short visit. Can't put my finger on it, but for a short holiday, I think I'd suggest Shanghai over Beijing. Maybe it's the river? maybe it's because I've lived in Beijing for too long, and just like the change-of-scenery?
Although, unless it's for a VERY short duration, I'd not recommend an airport hotel in either case.