I think they should keep the limit on regeneration, and do an episode where the doctor actualy dies, but then the timelords (who return before then) grant him an extra 13 incarnations like they did with the master in the timewar as their version of a medal of valour. Then that's the problem solved until doctor number 26 decides to leave..............