Would it be possible for you to make him, like…incorporeal every time he starts a fight with someone?

The only exception I’m thinking of is if he has to react in self-defense or has the consent of the other party to spar.

The effect could last an hour, and then he’d be solid again. Wouldn’t be able to ghost into other people’s rooms or other locked areas while incorporeal, though.