Need advise for reapplication - previously self-employed

Hi,

I'm planning to re-apply under the Canadian Experience Class next month. My previous CEC application was submitted in October 2010 refused in July 2011 on the basis of work experience not meeting requirements – as they were all considered self-employment. Even though I have been working for the same government project through an IT consulting company in Toronto since January 2009, my employment status has changed three times in the past three years as follows:
-   Jan-July 2009:sole proprietor contractor
-   July 2009-Jan 2011: incorporated independent contractor (owned my own corporation which issued my T4s)
-   Jan 2011-present: Full time employee

Again, since Jan 2009 to Jan 2011, I've worked for the same project through the same consulting company. My role/occupation falls under NOC is 5124 for all 3 years. It's only my contract terms that have changed, and these were all done out of formality to meet the govt project's requirements.

I'm in dilemma as to what I should put in my new application, especially in Schedule 8 form for question #7: Work Experience. In my previous application, I only put the consulting company name as an employer without differentiating my employment status (sole proprietor then incorporated independent contractor), but I provided these details in the box provided to explain self-employment period.

In my new application, should I differentiate my work experience into the three categories? (i.e., sole proprietor – employer: self; incorporated independent contractor – employer: my corporation; full-time employee – employer: consulting company name)?

Any idea how the immigration office will likely respond to this situation? All advice and help will be much appreciated! I really want to minimize any risk of getting refused again.