My company lawyer suggested the same thing-

I have AP and H1. He's aware that using AP does not change H1 status but said that the officer at the custom may not. And it would not be a worth while effort to appeal. It's more stay on the safe side.