There are many ways to approach this.
First, your existing setup. 20w is a LOT of light. I know, I do 24hr mtb bike races and I use 38w of light myself (2 19w bulbs). It's really too much light most of the time. The only time that much is really needed is when I'm going downhill at HIGH speeds. I think you could work just fine with less. This will save: weight/complexity/cost. Your setup runs 3 hours max, right? You've got a 60 watt hour battery and a 20 watt light. That's pretty short for an all-nighter.
Since you're on a bike/canoe/foot we've got light mounting challenges also. I'm gonna throw some suggestions out here and make some assumptions. I can revise later if needed.
Assuming you don't want to use multiple lights or can't use them or can't afford more than one I'm gonna build a scenario around just one light. I'm also gonna use a headlight. They are versatile, hands-free, shine where you look, and no mounting brackets are required.
Existing stuff on the market in the traditional headlamp arena tops out at about 5 watt of power. This is talking about petzl/princeton tec/etc. I would like to see you using about a 10watt bulb in a a spot beam configuration.
Ok, I'm just gonna come out and say it. Turbocat. These guys make the best bike lights on the planet (sorry, niterider/etc but it's true). They make a helmet-mounted light that is available with an optional strap for mounting on your head, not a helmet. This light has bulbs available in the following sizes: 5w spot, 10w spot, 10w flood, 15w spot, 15w flood. They run the bulbs in an overvoltage setup so expect to get about 12w out of the 10 and 19 out of the 15 and 6 out of the 5.
The main problem here is NOT the light, but the battery pack. Even with a 10w bulb, their largest battery pack will run about 3 hours straight. FYI, their pack is a LOT lighter than your 6v lead-acid battery.
Their stock battery pack is made up of 5 "D" size nicd cells. My complaint with this pack is that if they used 5 "D" size nimh cells, the runtime would over double because the stock battery pack cells are 4400mAh in size. It is pretty easy to find 8000mAh "D" nimh cells, and some 11000mAh cells are around if you look hard enough. If you custom-assembled a pack from 11000 cells, you could get about 6.5 hours of runtime out of a 10w bulb. That *should* be enough to get you through most any night.
The cost of this setup is roughly as follows:
Head light $115 (includes overnight charger)
Conversion strap $20
5 11000mAh nimh "D" cells $9 each, $45 total
custom battery assembly $10-15 at local battery shop
total $180
This is an EXTREMELY good price for a light setup of this quality and endurance. Turbocat also includes a "crash-warranty" on their stuff. If you break it (yeah, right) they'll fix it for parts cost plus about $10. You can read the (rave) reviews on their head-mounted light here
http://www.mtbr.com/reviews/Lights/product_22232.shtml
If you're gonna use this setup, I would order it with BOTH the 5w and 10w bulb. Start with the 5w. If it's enough for you, your run times just doubled to 12+ hours. Heck, I would order a spare bulb anyway. These things are tough, but you never know when one's gonna blow. For what it's worth, I have had my set for about 5 years now. I am still on the original bulbs.
If you need MORE than 12 hours of light, get ready to carry an extra battery. Or, carry a small light for use when the big boy isn't needed. The uk 4aa eled light is TOUGH and will run for 15 hours on 4 aa LITHIUM cells. I think it also floats with lithium cells installed.
If you need more info, let me know.