I'm in the same boat.
The dereelight something or other NOHS might be what your looking for. But the tech behind it gives me ideas.
I'm going to try something when I get home from work. I have an DX ultrafire 502. that I'm going to try and mod well I come up with some funds for others attempts.
I'm going to take some tape and cover the reflector. I will try scotch tape or electrical, and if I can get a little cash some form of reflective tape. All I'm looking to do is reduce the throw and get a beam like the NOHS, but with a little more power!
Other things that might fit your bill, without knowing all that you want (i.e. modes?) would be Malkoff flood, also the liger (SP) from nailbender could do it. They are both P60 drop ins only one mode IIRC.