You talked about the guaranteed minimum income. That would certainly be the simplest solution. Anyone receiving this minimum income without really being entitled to it, because their income is too high, would have to pay it back on their next income tax return. This is one of the solutions that I think is interesting.
On April 3rd, 2020. See this statement in context.