Switching between 2 power supplies upon dropping below cutoff voltage efficiently
The problem you are facing has a solution. It is called "Power Path Controllers". Please examine the following portfolio of Linear Technology (now Analog Devices) products, Power Path Controllers and Ideal Diodes, I am certain some ICs will fit your need. 

It looks like this one might work for you, LTC4419.