I suggest you hang tight then act once your new passport arrives (ensuring it does prior to July 20 - being your current OA extension expiry date) then visit your local immigration office with all documents in hand to apply for your new extension, which will be stamped into your new passport, obviously as long as all application documents are correct & in order. No dramas.