I think at the end of the day the only way to get it sorted properly so it lasts a good few years is going to be a rebore and new Pistons? I may as well get it all done and sorted now rather than having to pull it all out again in a years time.
Do you know anyone who can do the machine work rob?