The more I thought about your point that the Wave story line really did make Kakashi take his training seriously. 
-nods-

Depending on if you want them involved or not that could work. 
I'll leave that to you and have her get kidnapped the day after they get back and the information get to the office of the Hokage.
-nods-
-smiles-