In your drawing, the feedwater and expansion tank are teed together and then connected to the discharge. If that tee was instead connected to the return, the problem could be resolved without moving anything. This might be the simplest solution.