I pretty much agree with what you said, except at the part of inside training to the Yi. Very low inside skills, and short. No way he can be an SF.
Oh, I suppose I wasn't very clear. I don't recommend training Yi in inside skills at all. I mean to finish his guard skills with a new batch of trainees, not his interior skills.