My understanding (which, together with $3, gets a large coffee) is that your 35 years maximum window remains the same. So, at 25 years (in your example) you would be pension eligible, for a pension of around the equivalent of 20 years.
But yes, it's complex, and the CFSA, its related regulations and the PBDA and its regulations are complex - better to contact the pension office for clarity.