If anyone can help me find a good one - I don't trust my own skills in selecting a good condition engine!

But you're quite right, that is the thing to do.

But also this is a good excuse to buy the second, bigger bike that my mum thinks I don't need