Thanks for the link. I've just gone through various combinations of exit date, rank etc and assuming I live to be 80 I haven't found a single instance where I am better off under the new scheme.
As you say, not a particularly difficult decision to make.