Give him the surgery now. He is so young by the time he is MLB ready he won't have the pitching limits on him, he'll have the innings limits down in the minors.
And this exactly. Several very successful major leaguers had this happen to them very early on in the minors.