In Paris go see Les Invalides, its an amazing military museum and also houses the tomb of Napoleon.

As for cathedrals I've told you, Saint Chappel is the most impressive as far as stained glass goes. Chartres is amazing as far as the architecture, Notre Dame is just big.

In Amsterdam be sure to get some frites and mayo!