LiPo will do the trick. Being typically rectangular they fill rectangular spaces nicely, displacing all that unwanted air in a dive torch. There is one catch however... most canisters and torches are cylindrical!
Li-ion, and specifically 18650's remain the best value for money.