On the other hand, don't bother with all that old wax and whatever. Just do what a zillion Armourers shops in the world do every day. Bead blast, phosphate and paint. If you want to keep the marks as-is, then you'll only be kidding yourself that it's original - when it's not.