What is the best option for my situation?

My partner and I are currently working on his Canadian Immigration paperwork so that he can eventually come live with me in Canada. Until then, I have been visiting him in New York for extended periods of time. The paperwork is done and we are waiting for FBI background checks (which I was told takes 10 weeks). Because of this hold up, I need to stay in the USA longer than 6 months and want to know what my best option would be. I have already been here 2 months and want to figure out what I'll be doing now, rather than leave it until the last minute.

Here is a brief timeline of my recent US travels:

- August 2008 - Came to New York and stayed a month (mid September)

- October 2008 - Planned to come to New York and stay 2 months. Long story short, when I told the officer I was visiting my partner, I was detained and interrogated about my relationship for hours. After being told that a long distance relationship was "not a very good idea", along with many other judgemental and discriminating comments, I was eventually denied entry stating I needed to see a doctor and determine if I was a flight risk. In short, is was just an excuse to put on paper to deny me.

- April 2009 - Attempted to enter the US but needed additional paper work. (More doctor stuff)

- May 2009 - Finally was approved for travel and left for New York. Was stopped at border while they pulled up my paper work in the system, and was eventually let in. Told them I was staying a week, stayed 6 months.

- November 2009 - Left after staying 179 days (1 day to spare) and returned to Canada for 2 and a half months.

- January 2010 - At the end of January I entered the US once again. There was no mention of my previous issues or any questions about paper work. I was simply granted entry and told to have a nice trip. I told them I was staying 3 days.


My 6 months will be up in July, but going back home until my partners immigration stuff is done, is not an option. How do I stay here until the end of the year?

I don't just want to stay illegally and then be banned from travelling back here.
Would applying for an extension be a good idea?
What if I leave in June (before my 6 months is up), stay in Canada a week and then come back in, will I be allowed to stay another 6 months? And what are the odds I'll be let in? Last time I entered, I had no problems at all.

I really just want to figure this out. I'm not working illegally or anything. Just can't do the long distance thing anymore and want to be able to live with my partner for more than 6 months at a time.