If you haven’t returned the system yet, I would definitely try with everything turned on full: E cores, multi-threading and all. I’ve seen posts by several people, who seem to be happy with their modern Intel CPUs running in fully stock mode.
If that’s still not satisfying, then the AMD option may be worth trying.
I had written up my reasoning for my recent system build, just in case you (or anyone reading this thread) is interested.