I would also just leave it in primary for longer.
When you're in Berlin, if you have to time I definitely recommend taking the very short train ride to Potsdam for a day.
http://en.wikipedia.org/wiki/Potsdam
And stock up on bottles and glassware at Bier-Spezialitäten-Laden, Karl-Marx Allee 56...