Unfortunately generally the “slower” chip sets also run cooler so many flagships will have heating issues to contend with depending on ambient temperature.
I hate my P6 Pro for that reason, and will be doing the same as OP and avoiding any poorly heat throttling phones in the future.
I’m tired of having my videos shut off mid shoot because of heating issues, or issues while using GPS on the motorcycle.