my 2 cents.. want the advise ?
the best is since the original engine is a 1.8L M40 engine, running on a bosch mgmt.. then put in a 2.5 using also a bosch mgmt, not a 2.0 which is a siemens mgmt. If you put a 2.0 now, changing the block to a 2.5 will need a 2.5 bosch mgmt. hence wasted money to me anyway.. try looking for a 2.5L bosch wiring and ecu, sensors..or a 325 half car..
regards.