You know, I'd say just add defensive roll and swap it for one of the Self-Concealments, but we'd also have to swap in Dodge. I guess we could change out Improved Feint, although that's reasonably flavorful itself (and dropping Imp Feint would remove some of the rationale for Combat Expertise). Hmm.