This more like a DnD 5th edition issue more than a game issue.

And also not sure how it would riled up DnD fans because game added non-PHB/supplementary books rules.

I think our best bet is for mods.

Counsellor Florrick's favorite Warlock.