Kreuger,
That's the way I understand it - you'd get what you earned for your service up to 53 when you left service, and assuming that was at 55, the remaining 2 years pension would be based on the new career average scheme and paid at 60 - effectively a second pension.
But I would say that I'm not an adviser of any kind, so you might want to get that confirmed by someone actually qualified to talk pensions. (Although I am hoping I'm right, otherwise it's going to be a bumpy ride!)