I may get flamed on this from the locals, but I would spend a little less time in Berlin and a little more time in and around München. I think that Bayern is much more interesting and scenic, and is worthy of a little more time than you allocated for it (unless you've already spent quite a bit of time there, that is.)