I have always believed, like you, that this is the plan. That both William and Harry have real military experience speaks to the Monarchy going forward. Queen Elizabeth I believe recognized the failings of Charles (and Edward...pffft)...so the ‘boys’ would be reared correctly.
Charles is a little PANSY.