With your solution using a diode on each voltage source, would there be any risk of a trickle charge draining the battery unexpectedly if the battery?
Current flows from high to low voltage, but the battery is at a lower voltage than the supply. Check the diode’s datasheet for the reverse current at the voltage that would be across it. It should be negligible