Extension for WP->HSMP->Tier 1

Hello people, apologies if this question has been asked before but I am worried about the new rules after April 2011 and therefore need some clarity.
My situation is as under -
First entry into UK – April 2007 under Work Permit
Switched to HSMP – January 2008 (with Bachelors degree)
Extension under Tier 1 – January 2010 (with Bachelors degree)
Since I will not complete 5 years of continuous stay in the UK, I will need another extension.

My question is will I be eligible to extend under Tier1 with Bachelors degree come January 2013, under the current rules in place.

any answers please...

I have read the guidance notes but still confused, can anyone clarify this for me please

* You will score no points for a bachelor's degree if, under the Immigration rules in place between 31 March 2009 and 5 April 2010:

you were given permission to enter the UK under Tier 1 (General); or
you were given permission to switch into Tier 1 (General) from an immigration category other than those listed above.

Can someone on this forum provide an answer please!!!

Moderators, senior members, anyone???