The rules above are correct with one exception. I am given to understand that visit visa period is not counted towards ILR or Naturalization residency period. So your clock, in my view, begins from June 2006 when you got marriage visa. Any how, check with your solicitor.