It took a while for this thread to get approved, I had already sold the magic sticks and G1s before this was posted. Also, the diode with fixed pins turned out to be a PL450, not an S06J. I'll reply to your PMs now :)
Edit: also, if you want me to buy a diode and put it in the Maglite, I can...