All sorted, after relocating the vacum on the FPR, I checked the fuel filter between the tank and pump. There was black fuel coming out of the entry side, so I cleaned that and then pulled the pickup from the tank was the caked up with shit could hardly see light through it, cleaned it out and hey presto it's back to normal. Now I need to think up a way of getting some sort of screen in the tank for the pickup, was rust flakes I think, which is weird because I had the tank cleaned and inspected before putting it in.

Also spent some time with the TPS this morning I think I got that pretty much spot on, not much if any difference to power but according to the Multi-Meter it's fine.
Thanks to everyone who replied and helped