On a other aspect the "date of entry in to insurance" seems important for me (2026er), I may have some UK contributions before this but maybe not a lot (student jobs) so it would seem better to ignore them as a later date of entry makes my average higher. Seems you need 40 years complete contributions now to get a full CP after 2026, that's a lot. In effect those who worked are covering those who had significant caring duties.
Edit: Rereading it all it seems none of that matters for post 2026, its 2080 or a proportion of that for the same pro rata pension?