Problem solved, gave up and took it to the dealer,
they removed the O2 mod, reset the tps and put a new plug, one step cooler for some reason.
It runs better than I can remember, fingers crossed it stays that way