New ILR rules and Bacherlor's degree points confusion

I am currently a Tier 1 (General) resident. I was granted tier 1 leave to remain on Nov 2009. Prior to Tier 1 (General) I was under HSMP leave which was granted in November 2007, I received my HSMP approval letter on October 2007.

I am due to apply for my indefinite leave around November 2012. In order to qualify for ILR according to new settlement rules from 6th April 2011 I have to meet the same criteria that applied when I last extended my permission to stay in the UK.

When I extended my leave from HSMP to Tier 1 (general) in October 2009 I was granted 30 points for my Bachelor’s degree.

Now under the new rules “An applicant will be awarded no points of a Bachelor’s degree if:

(a) His last grant of entry clearance was as a Tier 1(General) Migrant under the rules in please between 13th March 2009 and 5th April 2010, or

(b) He has leave to remain as a Tier 1 (General) Migrant under the rules in please between 31 March 2009 and 5 April 2010.â€

See Latest Set (O) - Conflicting language for Bachelor's Degree