Ok got the car back after being on the dyno it confirmed something wasn't right, was showing it was running lean and a lot worse when warm, after going through all of the above again swapping, soldering cleaning parts it ended up being a dodgy injector. Changed the rail and all seems fine...