I do the same thing, I use the same batteries in the same lights, and have "charge" and "use" sets that alternate...for the ones that take multiple batteries. (Same batteries move in dedicated sets, same set charging/same set in light, etc...)
For the one battery lights, I just rotate the stock of non-dedicated singles so to speak.