On Tier 1 visa but just got married, quickest route to ILR?

I am currently on a tier 1 visa expiring in early 2013 and have just got married to a UK citizen (living in the UK). I understand that to apply for ILR I need to have been in the country for 5 years (under a work permit) and 2 years under a spouse visa.

My question is does it make sense to apply for a Spouse visa now or just wait until end of 2012 when I can start apply for ILR after living in the UK for 5 years? I am not sure if the fact that I already live in the UK counts towards the 2 years needed for the Spouse visa and if it might be cheaper/easier to do it via the spouse route compared to the work permit route?

We have been living together for a year and a half so by mid next year I would have had 2 years cohabitation.

When did you first enter UK as a HSMP / Tier 1 (General) migrant?

I entered the UK under Tier 1 in Dec 2007.

The earliest you may apply for settlement as a Tier 1 (General) / PBS migrant will be Dec 2012.
The earliest you may apply for settlement as spouse of a British citizen is (under current rules) 2 years from the day FLR(M) leave is issued.

Take your pick.