After giving it some thought, I realized my "simple" fix seems unnecessarily bloated. Maybe it would just be simpler to treat Eldritch Blast/Strike as class features, and just add an additional at-will to the Warlocks repertoire.
On the other hand, I'm still under the impression that the...