Looks right to me but the sourcing isn’t very helpful. 

When I ran numbers like this years ago I found it easier to do the comparison by total wealth / money supply, work out the averages there first for different wealth brackets, and then extrapolate back to Bitcoin. It’s so undervalued compared to TAM that a wholecoiner would eventually be global financial elite.