Little Update, well fired the car today & she went straight to 2,000+rpm

Shot & Duck were right on the tip of my tongue
Adjusted the max TPS at idle to 5% & she calmed right down, back to 1,400rpm. Once warmed up, rpms started to rise, so started pulling loads of timing out.
I let it sit there from cold to 180+degs & idle maintained 1,400ish RPM, with out any hunting.
Might not seem like much of an acheivement, but haven't been able to do that for a while
Had a couple of miss -back fires, but think I can cure that, if I smooth timing transition out, balance fuel.
S/ware is quite handy as has an interpolate feature, so relatively easy to do. But will see how it is on the road, before doing any changes.
Planning to go to the Donuts tomorrow, might even get my mate to drive & see if I can do adjustments while were driving.
The above story is the whole day condensed into 2 mins reading, Bananarama! was that simple in real life

"I spent a lot of money on booze, birds and fast cars. The rest I just squandered."