You did perfect on the removal of that crap and keeping the etching intact. Satin way was the way to go.
That boat will sail like some of the best!