Okay okay, back to F/I. Personally, i would go with a 3.0l swap to start out with, then you can build from there. I wouldnt put F/I on your 2.5l only to find out that three months later you want a 3.0. Yes, the F/I components are all easily transferable, but why not save yourself some time and just go 3.0l to start out with. Plus, 2.5? 3.0? 2.5? 3.0? is the decision really that hard?
