I am sorry but perhaps the word “upgrade” that you’re using is not appropriate here. Not everything Apple does is an “upgrade”.

Quite a change in the laptop and mobile phone front; in fact I am thinking of adopting the same set up. Could you please please share with us how Note 5 and Microsoft Surface affected (hopefully improved) your productivity?