Schmidt Edelux lights are excellent, even if you don't save much money they're on more or less permanent backorder from Peter White Cycles, the Schmidt importer.

It might be worth your while to compare the prices of Ortlieb panniers and bags, they might be cheaper in Germany.

Are you going to try to get the Mehrwertsteuer refunded?