Secondary fuel pickup when heeling

[Cyrus Safdari]

When a sailboat is heeling, and the fuel tank is partially empty, the fuel pickup can suck air into the engine. One solution is to install a secondary fuel pickup on the other side of tank and place some sort of valve and t-fitting so you can manually switch from one to another fuel source but this too creates a risk of sucking air (if the valve is not fully turned, for example)

Is there a more elegant solution?
Thx