For what it's worth, my German mother absolutely loves Vienna, and says it's one of the best cities in the world. She enjoys going to the opera and walking to the little cafes and whatnot. She definitely prefers it over Berlin; but then, she's never stayed in Berlin for a substantial amount of time.

No matter which you decide though, I'm sure you'll enjoy the experience. :)