A) as mike says, yes, his suggestion is exactly one I would give you
B ) skip stage 1, useless IMO especially with no ECU piggyback. I guess get yourself a decent true dual for the future FI. No need for intake and headers as you'd ditch them with FI, I'd go a proper plenum instead, again in view of the FI mod.
HKS TT was displayed @ the Tokio salon, haven't heard anything else yet, if you get it in UK is gonna be AT LEAST £10K is my estimate, wait and see PS do the internals as well, might as well do it all together really