You can go straight from 10-cell NiMH to 3-cell LiPoly with no other adjustments to the system. Both have roughly the same voltage under load when properly configured, and provide similar performance.

A Thunder Power 2100 3S4P pack will give you about 2.5 times the run time. Not sure about weight, though. I think they're marginally lighter.