I've had a Petzl headlamp for 10 years now, still works great. Your post got me looking around online a little bit, and there are some really nice ones out there now it looks like. A detached battery pack would be a really nice feature. If you don't get that, I'd at least get the one with the battery on the back of the head. Mine has the batteries in front and it's awkward when you lean forward. Here's a selection at REI

http://www.rei.com/online/store/CategoryDisplay?catalogId=40000008000&langId=-1&storeId=8000&categoryId=10075628&

This one in particular looked sweet

http://www.rei.com/online/store/ProductDisplay?productId=47650424&storeId=8000&catalogId=40000008000&langId=-1&

Having a locking mechanism so it doesn't turn on in your pocket/bag sounds like a really nice feature. I've run my battery down several times on accident like that.

PS - I'd fish 150+ days a year if I lived at Rancho Murieta too :)