I'm giving in on the original body for now, as there is too much work needed to bring it up to scratch (after my mangling). Arriving in the post was another replacement fan unit, and another radio disc/aircon unit, and as I picked up a couple of spare bodies last week, I am starting again!!!
This time around I have learnt from my mistakes, and won't be quite so adventurous ... not doing the marker lights or number boards for now, but leaving them for when my skills have improved - this should make the job much quicker and easier.
The original body will be safely packed away for later use when I have the skills, time, and patience to do a proper job on it, and turn it into a dummy loco ...
Wish me luck second time around! Now, where did I put that mini-saw?