Good idea to stay away from chemicals. You'll only have to sand after anyway so stick with what you're doing.
If you want to save the etch you often need to compromise on pit removal but go slowly...