The fuel pump module will fit in the square baffle area. It has flaps that will control fuel slosh when heavy cornering or stopping. Hopefully keeping the fuel pump full of fuel.
If you are running a return to the tank - and I hope you are - pipe it to feed back to the inside of the baffled area. That way even when the tank is nearly empty the fuel from the return has a short path back to the feed.
The only problem I see with that is the float may then have a higher reading because it is inside the wall.