Actually, the list in the OP is the same, since the flights were committed-to when I wrote the OP. The only part of the trip that is almost completely fleshed out is the European one. I will fly into Madrid, then go to Barcelona, Nice (France), Rome, and then home to Germany.
rumborak