My friend, don't pay too much attention to raw specs such as tdp. Test results is what mathers most:
https://nl.hardware.info/vergelijkingstabel/producten/363005-386392-440721
So basicly you would be better of with either and i'm pretty sure you can sell of the stock cooler for a fair amount since it has good rep and love.
However if i were to pick up a 2700X i'd match it with a pricey but very worthy Be Quiet Dark Rock 4 (presuming there would not be a blowerstyle gpu in the case otherwise the Arctic would provide plenty for my needs). I feel that would be a great match and if you wanna go all out and oc that mthrfckr get the Be quiet! Dark Rock Pro 4.