I am a big Streamlight and UK fan where you are dealing with the outdoors/water. I would highly recommend:
UK 4 AA - brighter than the Tec 40, although it uses a bi-pin so you can't easily change bulbs
UK SL4 - this is not much longer than the 4AA, just a bit fatter, nice tight beam
UK 2L - smaller than Mini Mag, a bit fatter, as bright as the 4AA, has a clip (carabiner type)
Streamlight 2AA Propolymer - not that special, but has a clip, much brighter than Mini Mag
Streamlight 4AA Propolymer - brighter than UK 4 AA, tailcap switch
Streamlight Syclone - it has a LED backup bulb (white, green, or amber) plus a xenon. The beam is not especially good but it should be quite versatile. Has a belt clip
All of these are waterproof to something like 300-500 ft.
The best prices for all of these is
Brightguy