Your car must have 100s of hour work time, it's an absolute credit to you. I see what you done with the fuel pumps. I did have this as a thought as well. I poped the cover off and looked inside. I wanted to keep my fuel gauge sender and decided I couldn't fit an baffled intank pump and keep the sender. So opted for the good old swirl pot set up But also adding to this I had to get this done fast. The car was off the road for 8 days. I did also think of making an L shaped intank baffle setup. The but would mean cutting the hole out bigger in the tank to keep the gauge