Ended up with a 3700x. They seem to run at the very edge of their thermals straight out of the box though.
I tried a light touch of overclocking and got absolutely nowhere. (Stock cooler)
Running that close to the edge is an achievement in itself though I guess