You can be I-485 pending and
H-1 holder at same time. At least that was what my lawyer told me. I went to Canada and returned with AP. I had same concern as yours also my EAD was about to expire even I had never used it. So I called my atorney and was assured that it is ok that I was still on H-1B status.