ILR Application - HSMP route to Tier 1 General

Hi there, I need an advise or guide with my ILR application. I got my HSMP in Oct 2007, arrived UK in Dec 2007. Later applied for extension in Oct 2009, had some slight issues but extension was granted in June 2010. I'm applying in Feb 2013 at the Glasgow PEO. So I need a clarification on SET O form, Page 9 section 3 - Which Category do I pick, is it Section A or B, based on my immigration status and do I need to complete section 9 of the form i.e. Point scoring assessment for (age, previous earning, academic qualification and life in the UK)? I'm guessing I would come under Section B and perhaps tick the box for "Highly Skilled Migrant Programme" category since that was the route I was originally granted an entry clearance and applied for extension before switching to T1G. In addition to the above which criteria do i come under i.e. (1) Applications for leave to remain where the applicant has, or last had, leave as a Highly Skilled Migrant, as a Writer, Composer or Artist, Self-employed Lawyer, or as a Tier 1 (General) Migrant under the rules in place before 6 April 2010 and has not been granted leave in any category other than these since 6 April 2010 and (2) Applications for indefinite leave to remain where previous leave as a Tier 1 (General) Migrant was granted under the Rules in place on or after 6 April 2010. I hope someone can shed more light in this matter. Your assistance will be highly appreciated. Regards.