ILR application (after work permit and EEA fam. member)

[ben_aladin]

Hi,
I have achieved 5 years permanent stay in the UK and would like to apply for my ILR.

My situation is a bit particular as I have stayed the 2 first years in the UK with a work permit (that has just expired) and I switched to residence card when i got married to an EEA member (Italian national) residing in the UK 3 years ago because the EEA residence card gave me more flexibility in terms of work.

1) Should I apply for an ILR on the basis i have stayed 5 years in the UK ? and apply as a work permit holder
2) should I wait 2 more years until i complete 5 year residency under the EEA regulation and have the automatic ILR?

Thanks for your help.