You oughta buy an pgmfi intake and wire it now, so when time comes to do the swap you have less shit to do...