Joe
(plumber joke)
I try to keep things on the simple side.
The 510 charge port is "live" and wired with a much smaller ga wire and placed hopefully in an inconvenient place.
But it is not fool proof. A diode would drop voltage and most Li-ion cell/charger set ups will not compensate for the voltage loss. A Mosfet switch has a very low resistance when on. Turn it on at the right time and voltage loss is almost nil at charging currents.
Not sure what's in your nimh packs but since you have them, use them. No need to let them sit around.
They don't need the same level of protection that Li-ion cells do.
Even the mods I make with UN-protected Li-ion cells have a protection board in the circuit. They are about a buck from DX. I order about 10 at a time, and about a month later, SURPRISE, they arrive
Another, somewhat redneck approach is the Rubber Band charging adapter
(rubber band to hold the switch on and put in on charge through the atty connector),
Looks dumb, but works.