to marry before or after PR application?!?

Hello!

I'm a foreign live-in caregiver based in Ontario who is about to complete the 24-month period required for PR application by July 2011. I was informed that the processing times nowadays will take 10-11months for step 1 approval, and another 15months for the final approval. The thing is, I have a fiance back in my home country and we originally planned to get married AFTER I received my PR, then I will sponsor him to Canada. However, since the processing times tend to get longer as days pass, I don't think I can wait that long. Now, I'm trying to choose between two options.

Option 1: Finish my 24-months requirement - file for open work permit/PR - wait for approval (which may take up to 2yrs) - go home and marry my fiance - then file for spousal sponsorship.

Option 2: We'll get married prior to July 2011 back in my home country, and then I will file for my open work permit/PR including him in my application.

Any advice?

Thanks!