Yeah, that's the plan.
In other news, this happened. JUN Auto lightweight flywheel for the KF engine. 4.5kg vs 7.9kg, and cheaper than a Fidanza after shipping. - plus Japanese quality.
Not actual pic - that's a B6 one above.
These are getting tempting, too - a set of the cheap MX6 stainless manifolds, even if the loop needs shortening.
http://www.ebay.com.au/itm/390459401175
Really should sort out a new clutch and some new engine mounts first though lol