Setup questions
 

As far as Rx7's, this will be my first semi-serious build. My setup I have so far:
87 turbo ll
S4 motor, large streetport, I believe RA seals, all emissions blocked
pt67 turbo .83 a/r
40mm turbosmart wastegate and bov
stainless manifold
3" downpipe/exhaust
parallel fuel setup -6 an lines, I have 720cc, 1000cc and 1600cc injectors
(Plan on running 720s and 1600s)
Aeromotive fpr
twin 255 walbro's in tank, rewired circuit with relays
front mount setup
Koyo with electric fan setup
Microtech lt10s with x4 box, 4 trailing coils with ignitors bypassed
Act 6 puck sprung
innovate w/b and profec-s ebc

My goal is 400whp as it is an s4 keg. All my parts will be going on within the next 2 weeks.

Any advice or critique on the setup? Do I need a catch can, or fuel surge tank at this power level, and also do I need to upgrade the supply, or return line from the fuel tank? I've searched but haven't really found anything straight forward. I'm basically wanting everything good to go so I do not waste my tuners time when I make the 7 hour trip.
Thanks in advance!