There are lots of good (and affordable) chargers out there that can charge both NiMH and Li-ion batteries - if you grab one of those, you could use that one as your primary charger from there on out, and not need to worry about which battery needs to go in which charger. The XTAR VC4 and the Liitokala Lii-500 are the ones I keep around, but others will surely have their own recommendations too.