thanks so much! this is really helpful.. to answer your questions in case it changes anything you've said: yes partner's French, has been living/working in UK just over a year, and we've been together nearly 5 years (in Canada together previously). will definitely look into the FR consulate on EEA ...

I'm Canadian, (first came to UK on student visa) received a 5 year EEA2 visa last winter and have been working and living in UK with EU partner since. Partner is likely moving to another EU country (France) for work soon. I have a fulltime job in UK and hope to stay here for several more months ...