Hi lampbreaker,
I have a similar concern. My H1B was approved recently for an in-house project and I had to file an amendment for my current Client. I was on STEM OPT until January last week. Change of Status was approved as well & I received I-94 number. I have to do soft landing in Canada...