Power path (load sharing) 3 sources

[okw]

I'm designing a a circuit for power path (load sharing) which takes 6V DC adapter or USB to power a TP4056 Li-Ion charger, which in turn charges a battery. If only battery is present (no DC in / USB), this should power the 3.3V regulator which supplies the rest of the load. If USB is present, it should charge the battery and at the same time power the 3.3V regulator (not draw from battery). If DC is present, it should do the same as USB, but "disconnect" USB, so I'm not pumping 6V into the USB rail.
Would the attached circuit be sufficient? Or could this be done more elegant?
I didn't utilize the "ground breaker" (when plugged in) in the DC socket. Maybe using this could save me a component or two, or make the circuit better?
Also not sure if I need the diode on the DC input?

Note, all TP4056 circuitry is left out for readability.