There is a tendency to maintain H1 even after EAD and AP.. This is so that if in any case i485 is denied, they can still maintain a legal status. If EAD and AP is being used and I485 is denied.. automatically your EAD and AP invalid.. However, the case can be reopened.
But if you are afraid of the potential denial (not RFE) of I485.. (I thing either you should fire your lawyer or get a new job)... then go through the hassles of H1 stampings and simply don't apply for AP or EAD...
As for me.. I don't have a problem with the H1 stamping. THe last time I got it done at the American Embassy at my spouse's COB. No hassles at all like what you read about in this forum (for India)..
However, I will use my AP and EAD if need to travel but we have no plans till end of year.. I am hoping that by then I would get GC
Also... most definitely I would use AC21 to switch co by end of year if I don't have GC by then.. which means .. I'd be on EAD..
hope this helps..
radd