Macbilt makes a very nice baffled and enlarged sump with internal gates, proven on New Zealand tracks many times over
I’ve got one on the gravel express atm, there may or may not be photos of it in my WRX build thread from a few years ago
highly recommend, I’ve had it for at least 6 years now
May as well ask them about their breather setup they make for racecars as well