if you're really worried about temperatures, then you might want to think about going for intel (much less heat). but if you want to stick with AMD then i'd go for water cooling, or maybe a large air cooler (noctua d14?). Don't overclock it at those temps.
Since you cant get below ambient temp in either, I suggest buying an AC. Could even be a mobile one if you don't mind the noise.
Water cooling also doesn't help with cooling the VRM/Mosfet/NB so that's another thing to consider as well.