I have been also on the other Danube site, where "Evergreen"  has posted many good suggestions.  Also Jill has mentioned the Vienna  optional concert.  You  might want to check those out.  Esp. those who are planning to use the transit system in either both or one of the cities.

Mary