I think there's an extra, important, oft-missed part implicit in your scenarios:

1) make everything the same, the good and the bad, just extend the address space, and replace all the networking stacks in all the gear everywhere. ... but don't make anyone learn anything new

2) if we're already replacing everything, make stuff better ... and make everyone learn everything all over again