Yes VGS its best way to approch immigration lawyer as you are to close with timelines. usally lawyers are costly you can contact some trusted consultant use www.iccrc-crcic.ca to find one. it will be little cheaper.
Also try to extend your WP if possible. Also order your RCMP criminal test one week before u leave it will save ur time.
Thanks PA1984, I Will try for my extension.
I got the PCC result recently.
Do I need to request RCMP criminal test also? Could you tell me the procedure to request one.
Usually RCMP is not nessessary at time when you are in Canada. But as you are going back I thought its better get it before u leave as you will need it if you apply from ur home country.
Go on http://www.commissionaires.ca/national/en/services-personal/personal-criminal-record-checks/ usualy it is digital and u can get it within a week.