In this case no. After either his return or the engagement there is more trouble lined up, being problems in the family business, so he has to adjust from combat mode to paperwork battle, and he's not too good with the paperwork to begin with, so this will induce confrontations of a more subtle kind. :-)

Damn, writers are mean... LOL!