Thanks for the information on batteries - I'll be looking soon to supplement mine also.

As for a 16GB CF card Enduro, Cheap Chips (an AF sponsor) have a special on the Lexar Pro UDMA 300x for under $70.