My 2 cents.....
Do it correctly: EJ207 (blueprinted from factory) bottom end. Regents Subaru will get one in for ya cheap.
Use existing high flowing MY99 Heads and manifold.
Then Power FC it.

or

Assuming the MY04 motor is cheap, do as Tuna suggested then do it correctly and get a M800 OEM to run AVCS.