Yea will be waiting for a few weeks more. My school had QnA video conference recently for the upcoming Sep students and the main question was "What if I don't get my visa on time?". They told us not to defer yet and to wait for a few more weeks, around md Aug.Just hold on, you'll get it soon. They're clearing the May applications now.
Btw how long did they take to return the passport back to you with visa stamp?