I'm going through the same exercise for a 2-night stay in May. A colleague whom I trust said that the Vienna Plaza was better than the original Vienna, but since I need a room with two beds I would have difficulty getting a suitable upgrade at the Plaza.