Further developments...
I recently had the chance to try out a friend's bike, which has an identical hub to mine and an Edelux II headlight.
I was very disappointed, to say the least :-/
The output was nowhere near that of my current rechargeable Lezyne Megadrive lights.
As I seldom ride in darkness, I think I'll just stick with them and sell on my Dynamo wheel and light!
So, if anyone is interested in a 26", Son 28 / Rigida Andra 30 CSS wheel and/or a Schmidt E6 headlight, just let me know!
Thanks for all the help :-)