E30 motor swap tips?

ok im in the process of swapping a 87 325i motor, tranny and driveline into a 84 325E chassis. now if any one has some tips on easy ways to do this it would help. i've already gotten the motors and what not out of each car i just have to slap them into the right motor.
i aslo have a couple'a small questions.
1 whats the easiest way to set up an intake on the E30 motor? becuase of where the mass airflow sensor is its kinda tricky. so if anyone has any ideas it would help.
2 what parts would help out the most in performance for the 325I motor?

thanks alot