If I may make a criticism on your person as well Rin having strategies on both of them seems a bit redundant. Especially formation stuff on your medical character who wouldn't need to know such things unless she's a co-captain or has leadership experience. Which given she's cowardly seems a bit unlikely.

 In fact what do you mean by solo and team tactics/strategies on your first person? Do you mean she's a strategist or do you mean she has been taught how to do specific things in those scenarios. 

My guy is a planner not a warrior for example. He specializes in the making and thinking of tactics and strategies and then getting implementing them. While he can fill most roles he isn't a straight up soldier. The only reason he is so good is because he is so good at thinking and improvising on the spot.