EEA2/Family Permit Urgent Question

Hello,

I am an Australian citizen in a de facto relationship with a Greek national. I am currently on a Family Permit that expires on the 27th of July, living with my partner in London who has been exercising her treaty rights for over 2 years (i.e. being in full-time employment). I plan to submit my application for a Residence Card on the 3nd of July, as soon as we get back from a holiday that we're going to next week.

We just booked an overseas holiday for the 6th of August, and I just realised this is after my permit expires. How likely is it that I will get my passport before then, assuming I apply on the 3rd of July and request it back straight away, along with a Certificate of Application, and will I be able to do get back into the UK with this passport and my COA? Would it be easier to just apply for another 6 month family permit?

I am kicking myself now for not doing it sooner, the reasoning was that I would need my passport for work and travel. Thank you for your help, I am very anxious about this matter.

R