Yeah. I'm pretty done with shove. It was an interesting twist at first. Now it is just annoying as hell. It seems all the enemies tactics focus on this. And it seem the enemy's THACO for shove is an entirely different table. (Apologies for the old timer's reference, there.)
Ah someone else who remembers and understands THACO, does my old timer heart good

and yes, shove should be 5 feet unless it's from the Eldritch Blast invocation.