Toggle would be fine ...

But quite honestly ...
I dont like this changes for Wyll, for two reasons:
1) Roleplay ... you are born as Varian human ... and Wyll become Warlock a lot later ... so it dont quite make sense to me, so theese two bonuses should work together. laugh
2) Roleplay (again laugh ) ... since Wyll seem to be denying his class openly, so i certainly plan to play him as some kind of hybryd between Warlock and Fither with Pact of the Blade ... presuming Hexblade will not be aviable for him.

In the words of the senior NCO instructor at cadet battalion:
“If you ain’t cheating you ain’t trying. And if you got caught you didn’t try hard enough!”