Canada Immigration for spouse

I finished my canada immigration already in USA. I just sent out my passport for issuing visa. However, I'm going to get married within one or two month.

Q1: In this case, what kind of application I should use: family immigration or just add my partner to my skilled work application.

If it should be under family base,
Q2: can I apply for my partner before my landing? I don't want to separate with my partner.
Q3: Where can I file the application? Inside Canada or Canada Consulate in USA?
Thanks for your help!

The following is my timeline:
May 2004: application
June 2004: 1st letter
Jan 2005: 2nd letter, with interview waived
Feb 2005: medical exam sent
April 2005: 3rd letter