I second all the comments that were written about the Peninsula, best hotel on the river.
Also second the (many) comments about the absurdity of the no shorts policy at the MO. Why stay at a hotel if they are going to tell you that you can't be comfortable? Better to spend your money where you're respected and welcomed like the Peninsula....