Thanks for taking the time to post a review. Sounds like you've got pretty much the exactly the same requirements as me, and currently pretty much the same solution.
I've got a Saferide running at 1A, and a triple XML running at 1.5A for full beam, with a switch integrated into my brake lever...