I got a good....ie expensive...aftermarket rotary pump which is fitted the the petrol side of the kick panel. Fed from an 8mm outlet I diy soldered tho spotted this today
Used a stock scooby filter at the back of the car which I need to move as hard to access, it's a big bugger and then my return lines feed into the bottom of the fuel filler. There was an outlet so I just used it. Would be better lower but do for now.
No swirl Pot. No baffles. 13.1. No fuel starvation....yet