Does spouse visa count towards 10 year long residence?

[LEH21]

Dear all,

I'm hoping you can kindly help me out here...

I have been in the UK legally for 8.5 years, so another 1.5 years to go before I can qualify for 10 year long residence ILR.
I am currently on Tier 2 General sponsored by my company but as I'm looking to change jobs, I hope to resolve my visa issue as soon as possible without affecting my chance of getting the ILR as early as possible.

My bf (a EU-national recently naturalised as British Citizen) and I plan to get married this year but I'm worried whether changing into a spouse visa would affect my qualification for the 10-year long residence ILR.

My questions are:

1. Does Partner visa as spouse of a UK National qualify under the 10 year long residence route?
2. Does Partner visa as spouse of a EU National qualify under the 10 year long residence route?
3. Given my BF (EU national) has recently naturalised as UK citizen, do I still have the option of choosing to apply as spouse of EU or UK national? or can I only apply as spouse of UK citizen?

Thank you all very much!!