Well yes, SNI will be removed, when ESNI reaches far enough adoption. That's my point! ESNI does what SNI does, but securely.

You fix an insecure implementation by replacing it with a secure implementation, not removing the feature completely.