Hi Doug, further to your pm thought that it would be helpful to other Scottish members if I posted these links up here.
The machine shop that I can highly recommend is Agra Engineering in Dundee. We go back a very long time and they are a highly skilled set of guys. Ask for John, Jonathan or Ian.
Regarding dyno and mapping, give Jim Curley a shout at Star Performance, Dysart, Kirkcaldy.
I would advise you to stay away from Dastek.
http://www.agra-eng.co.uk/
http://www.starperformance.co.uk/
Cheers,
Alex.