Your info is wrong because these skylake processors are extremely difficult get to the point where it needs to throttle. Just doesn't happen. Many many many people have been posting youtube videos and repeatedly it's running much cooler than any previous years models in their torture tests. Last years imac had it happen sometimes where it would get to hot and need to slow down, the whole point of the skylake chips is running much cooler.No point of getting i7 if it throttles to the performance of an i5 or worse than i5 if i5 runs cooler
You are not running too hot. Your computer is doing exactly as expected, you're basically asking a pickup truck to haul a full load of gravel then act shocked when it revs up to do it. This is normal, and no, you're not going to get better performance under the i5. The i5 is going to get pushed to it's own limit even faster and therefore get just as hot, and it's going to STAY at that heat even LONG because it's not as good as those calculations as the i7 is.
Just stop worrying. You bought a high end piece of hardware and this is exactly what it's designed for. I have two cordless drills, I have a cheapy 20 dollar one I got from ace hardware and a very expensive contractor grade dewalt. The little is light and easy to use but after a few minutes it starts to warm up so I stop using it. It's low quality parts and putting a strain on it has a chance of wrecking it.
Contrast that with my 250 dollar contractor drill, I can use this thing for hours and even if it does get hot, I know it can handle it. It's purpose built, the guys who made it KNEW it was going to get used hard and so they used quality parts to make sure when it does heat up, it doesn't get wrecked. That's the same thing here. OF COURSE it's going to get warm, you're doing something very very cpu intensive. It's totally ok. It can handle it.