You will still be in status between June 1 and July 8, no worries. You can definitely do AOS. Whether AOS is the way to go is dependent on when your number is likely to become current. If this year's trend holds for next year, July will likely be it for your number.
For CP, you need to go...