But yes, even if all those things are fixed, I agree that the Warlock is kind of boring (and sucky) - one or two spells per combat then it's just EB away. Basically becomes a ranged Fighter at that point who can only use the Shoving Battlemaster Maneuver.
Indeed.
For starters it would be enough if they implemented Pact of Tome, then we could use more offensive cantrips for a bit more spell variety.