I'm hoping someone will be able to answer my question

I have lived with my partner (who is British) in the UK since February 2004. (I came here on a work visa in December 2003). Initially, I was in the UK on only a six-month work visa.
In June 2004, I went back to Thailand just before the entry clearance (visa) expired, this was simply because I did not want to extend my working visa here because it takes a long time (easier to get another work visa in Thailand than to extend it from here) and I needed time to prepare for our wedding. I came back in July 2004 with another six-months work visa and we got married in the UK in October of 2005. Soon after that, my employer had my work visa extended for me which involved a few months of my passport being sent away. I therefore, only applied for a two-year leave to remain (as a spouse of a British citizen) in January 2005 (which was granted).
We are planning to apply for my ILR in January 2007 and naturalisation a year after that. However, after reading some of the information on this web-board, I have a suspicion that we may not need to wait that long (Jan 2008) to take the exam and apply for citizenship.
Is anyone able to shed some light on this? Do we need to wait until my two-year leave to remain is about to expire and then apply for an ILR and then wait another year to apply for naturalisation (given that I have entered the UK in Dec 2003)?
Really appreciate your help.