he is patient and he wants to attack, but waits for the moment, and his newly found stamina allows him this patience
Yup, this. Many times this year he would patiently wait for a good time to go offensive and hit a winner. And if somehow the ball still came back, he would "reset" it and wait for the next good chance, was especially evident in matches against Nadal I think. Being defensive, then switching to offense at the right time was probably the key. When he was too passive or hurrying to end the point (in most of matches after the injury), it usually didn't end up well for him
He's more offensive in important matches (vs Nadal, Federer, Murray). He can be both.
I think against Nadal far more aggressive than against anyone else.