That sounds great! Good luck for the 2nd night in Amsterdam!
I didn't go for Berlin-Tickets, I don't know yet if I can go to Berlin that day and I didn't want to take the risk! So Amsterdam it is. I think I will connect it with a little trip to the Netherlands and some sightseeing, since I've never been to Amsterdam before. And July seems to be a lovely time to go to Amsterdam :-D