You should have filed PPS, it would be faster. And it still is now.
For OPT extension, the stop-gap doesn't apply to non-cap H1B, and for STEM 17-month, you will become H1 soon and thus OPT must terminate when H1 approval. Quite a waste to file STEM OPT extension, unless company wants to withraw H1.