Yes, but the two are related because increasing earned income tax and other taxes to fund non workers on people who do work sap the incentive to work in a manner that increases productivity (either via working more hours or working on hard problems).

Absolutely, definitely those two problems can only be solved together. Although right now I see very little effort going in that direction. If anything social benefits and taxes are increasing.

Germany's progressive tax system also directly incentivizes working fewer hours, as the more you work the smaller your hourly wage becomes.