As far as Amsterdam goes, my sense is the vaginas aren't the real pull there (ahem). I think it's a nice place and am happy to have it on the list, but I'll leave it to others to really advocate for it.
On another potential leg of the tour, I was thinking maybe another city in Belgium besides Brussels and off the beaten path like Liege, Antwerp, or Bruges might be nice. Or maybe we can find some nice trappist brewery somewhere? Check out the official tourist page for options.
One more city to throw out is cologne. They have pretty distinctive tradition there with kolsch. They serve it on a tray with small glasses and you drink a bunch of them. Sort of the opposite of munich where you probably shouldn't have more than four beers on the night.