S197 Return style fuel system recommendations?

[Badger]

I am switching from a Gen1 to a Gen3 in my S197 and the new setup requires a return style fuel system.
What is the one to get for road racing and are there any worthwhile upgrades while at it?

My old stock system has treated me surprisingly well and I only experiences fuel starvation once. Going to E85 might change this though.

Any tips or recommendation are appreciated.