I think you will find the baffle helps a lot with your problem. The engine getting leaner as it the fuel level goes down is normal. If the baffle does not fix the problem. You might try a header tank. maybe you could fit a 2oz tank between the engine and the firewall.

David