Whatever you do, buy cells from a reputable dealer, buy known cells from the Big 5 cell makers—to whit—Sanyo-Panasonic, Sony (Murata,) Samsung and LG, buy the same batch code and keep them married to the specific light in question.
If you don’t already own a capable DMM, get one. Your D4 should be fine for charging duties; however, trust but verify.
Chris