Hi, this is no easy task. You have to swap the engine, immobilisation, instrument pack, ABS (if fitted) ECU's and the Central control unit (piggy backed on passenger fusebox) and use the plips from the donor car. You will have to do this if you want no other problems. I would try the in tank fuel pump as these do fault regulary, they block up and destroy the pump. The filter is within the pump and I would not recommend changing this as the pumps are very delicate and tend to stop working after being messed with. Hope this helps. Also there can be many other things to check before going down this route, e.g. engine timing, stepper motor and set up (throttle stop adjustment), etc.