Isn't this entire discussion pointless? The limit was always meaningless, there are many reasons to end the show, "We reached the limit of regenerations that was arbitrarily decided on decades ago" is not one of them.
Personally I'd prefer if the limit is never mentioned again, or if they outright contradict the old show, what I don't want is an explanation, this is one of the cases were "screw continuity" is the only right solution to the "problem".
Why are you opposed to the Doctor having to face his own mortality, and actually face that he will die? The character wouldn't know he was indeed going to Regenerate. Lots of stories could be spun from both his belief he really could die and and also from his renewed appreciation for life after unexpectedly Regenerating
One Day I hope to be the Man my Cat thinks I am
Where are we going? And why are we in this Handbasket?