Unfortunately, the fix already exists. Its name is Diancie.
That said, idk, give Carbink the ability to use eviolite? Go all in on the defensive angle since Diancie fills out the offense.