It sounds like you are worrying too much and being a bit precious about it to really enjoy it. Its a Cat D already isn't it so I don't think its ever going to be worth big money I'm afraid mate.

It must be mentally fast right now after Stus mapped it so if you are not happy with it now you never will be.

As stu said, get something you enjoy