I'm not sure about the OPK, since you had two different positives. It is confusing to me. But I really hope you timed it so that all possibilities will be okay.
And I think that's a good game plan if you get a negative pregnancy test this month, so you can have everything checked out for sure.
I'm on stim day 11 right now and my retrieval got pushed back to likely Friday. Have another ultrasound tomorrow, so I'll know for sure when I'm taking my "trigger" shot so I ovulated 36 hours later. I'm super uncomfortable for the last two days, so really hoping it doesn't go further than that.