Has the overheating problem been solved?

I broke my z1 today after 23 months of use and now I need a new phone fast (today!!). So is z3+ really worth buying? :rolleyes: Or z3?