Actually I just looked over your pictures and one shows the top of the liner which has been leaking at the head joint anyway.........to be honest, I would start again with a new liner/muff assembly, new omega or CP piston, bored and honed to 0.005" clearance, lap the barrel/head joint to give the correct 2 to 3 thou air gap at the alloy broad faces, and carry on from there...........sounds expensive, not really if you want to sort it out properly and keep it reliable on the road. I don't mess around with old barrels/pistons as the grief in having to redo it over again is simply not worth it.