Li-ion is the answer.
I have had excellent results from both Rigid and DeWalt.