I believe there will be a lot more entertainers if you include all the people who create movies, music, games, etc.
I also think there will be an army of people caring for others - the elderly, children, the sick.
I do not believe that the 6% of people you think will have all the money will just buy more stuff with their money. They will buy other people's time instead and that's why your 80% group will be more like 25% in my view.