I already offer both of these in my games.
INT warlocks works a charm, just dont forget to also change the saving throw prof and agonising blast.
I allow one of the two patron bonus spells of each spell level, chosen by the player and can be swapped on each level up if they like. Works well for my table, but do note that I also have some significant sorcerer changes.