I don't see a need to make Warlock damage curve identical to what it is today, down to the dipping.
Change Agonizing Blast to a class feature with different rules.
Starting at level 2, when you deal damage to a creature with a cantrip, it deals additional damage equal to the number of invocations you know.
This makes low level Warlocks weaker, and high level single-class Warlocks stronger.
Make the Pact of the Blade able to use charisma to attack whenever you make an attack as part of a Cantrip as an extra feature. So double-stat can be handled either via Hexblade, or using Cantrips.
At level 11, maybe add Repeating Blast. "If you make an attack as part of casting a cantrip, you attack one additional time.
5d10+40 for EB (67.5), 8d10+16 for Fire Bolt (60), 8d8+32 for GFB (70) plus 6d8+26 (53) splash assuming +3 weapon.
A level 2 Dip in warlock deals 4d10+8 (30) with EB, 4d10+2 (24) with FB, 4d8+10 (28) with GFB plus 3d8+7 (20.5) splash.
---
Warlocks prior to level 9 deal less damage, but have a free invocation.
At level 9 the warlock is dealing the same damage with EB: 2d10+10. GFB deals 2d8+10 and 1d8+9 splash assuming an 18 casting stat and +1 weapon.
At level 11, the warlock damage goes up compared to before. 4d10+20 instead of 3d10+15 with EB (42), and 6d8+20/4d8+18 splash (47 and 36 splash) GFB, and 6d10+10 (43) FB.
Code:
Old New Stats
Level EB+AB EB GFB/SEC FB CHA WEAPON INVOK
1 5.5 5.5 7.5/3 5.5 16 +0 -
2 8.5 7.5 9.5/5 7.5 16 +1 2
5 19.0 17.0 17/11.5 14 18 +1 3
7 19.0 19.0 18/12.5 15 18 +1 4
9 19.0 20.0 19/13.5 16 18 +1 5
11 28.5 42.0 49/36 43 18 +2 5
13 31.5 46.0 53/40 45 20 +2 6
15 31.5 50.0 57/42 47 20 +3 7
17 42.0 67.5 68/53 60 20 +3 8
So maybe a bit too much power spike at 11. On the other hand, I've seen fighter/archer/great weapon builds...