As far as I can tell, these calculations are correct if things stay as they are today.
However, one may assume that the transaction fees are not going to stay at today's level. It may very well be that on-chain transacting on the bitcoin network won't be that cheap. Also, these calculations don't include off-chain scaling. We don't know now how big the impact of the lightning network will be and how it may affect the scalability problem.