Update, I replaced the wiring and TPS sensor loom plug last night and it has a marked improvement, however now seems to idle at 1500rpm when warm, and 900 with it disconnected, next plan is to check the TPS voltage and see if it needs adjusted since I technically set it before when the wiring was dodgy.