Tobbi Klein:
If you're happy with your WT1 (form factor, brightness, and run time) but are just looking to augment it with something more useful for short distances, you might consider the FM64:
http://www.surefire.com/maxexp/main/co_disp/displ/carfnbr/249/prrfnbr/776/FM64-Beam-Diffuser
The FM64 fits a bezel diameter of 3.7 cm. I think your WT1 is about 3.6 cm, so you'll need to make up the difference. (A few wraps of wide plastic tape should do the trick.)
You can get the same effect using a diffusing film or a diffusing lens, but the advantage to using the FM64 is that you can simply pop it open to restore your original beam. If you have got good manual dexterity, you can do this in less than 1 second. If you're clumsy like me, it might take you 3 seconds. The FM64 may not be pretty, but it is very convenient and it transforms the harsh spotlight into a buttery-soft warm blanket of light.