Don't swap between types of batteries as often their rechargers operate differently, and you don't want to overheat a Li Ion battery!
You can buy cells with solder tags which makes them a lot easier to join together, just remember to join them together as per the original.
