OK, I solved it.
So I did an S-OFF with revone, then locked and removed tampered (also revone).
Then I flashed a good RUU. It took ages to find a good one, followed another thread (2325010) on the forum which I can't link because of the restrictions
Then I used thread 1672425 to put S-ON again and now my One it back to full stock!