The series diode should work fine. If you put a resistor to ground as a load on the charge-pump side of the diode, any reverse current that flows through the diode will have a path to ground, and there will therefore not be any problem with over-voltage at the charge pump output. If there is a...