I assume its a Digifant by the H-reg...
For the high idle, disconnect the Idle Stabilisation Valve (ISV) and clean it out with carb cleaner. Do the same to the connecting pipes, and make sure it all gets put back together again tightly. Any splits in the pipes could cause the problem given also.

Cleaning the ISV doesn't always work, but it certainly helped with mine. Buying a new one is très expensive, so you probably don't want to go down that route...

If you're not sure what the ISV is, give me a shout and I'll get my MS Paint skillz out...

PS: unplugging the electrical connector on the side of the ISV should make the revs drop right down from 2000... you can run the car with it unplugged if its really bugging you, but it will idle really rough (or not at all) with a cold engine!