PERMANENT RESIDENT OR BRITISH CITIZENSHIP AFTER EEA2?

[kingklan252]

I am a Non-EEA national married to an EEA national in 2010. My wife is a Polish national. She has been living in UK since 2004 and been using treaty right throughout the period. She got British Citizenship Last month. Now she has dual citizenship as Poland and UK both allow dual nationality. I am also living in the UK from last ten years including whole time of marriage. I have been working full time since July 2010. We never claimed any benefits. My detail in points,
 I am a Non- EEA national.
 My wife is an EEA national.
 She also got British citizenship last month.
 She got dual nationality with a valid UK and Polish passports as both countries allow it.
 Marriage date 26/06/2010
 On 26/06/2015 I will complete 5 years as a family member of EEA national using treaty right in UK.
 Resident Permit issue date 15/09/2010
 Resident Permit expire date 15/09/2015
QUESTIONS:
1: After completing 5 years as family member of EEA national (who is British national now) can I apply British citizenship instead of applying permanent resident and completing 1 year on permanent resident status as my wife is British national now and I will have spent 5 years as family member of British national which I supposed to spent 3 years.
IF NOT THEN
1: When can I apply Permanent Resident?
 On the marriage date when I complete 5 years as a family member of EEA national in UK? OR
 On the date my Resident Permit is expire?
2: When can I apply British Citizenship?
 Do I need to complete one year on Permanent Resident status before apply? OR
 Can I apply after completing 6 years as a family member of EEA national in UK?
Any help will be appreciated
ZYAN