Hi everyone, thanks for your helpful comments. Went to Immigration today to submit all my documents. The affidavit was signed by the IO as suggested by some members. The submission went smoothly as I had all the required docos and the staff at the office were quite helpful. They added 30 days more to my Non O to allow more time for the final approval to come back (approx. 60 days left now on Non O). All good, thanks for the advice.
Thanks for the feedback everyone, this is a really responsive group and appreciate you all taking the time to provide advice. Second question is how long after you submitted all the docos did your extension get approved. Thanks.