I don't think this can be solved easily. Unless until
https://www.europarl.europa.eu/news/en/press-room/20220603IP... (3rd point) lands and the original idea is not messed up during the rounds of debate.
Until then, not going to happen IMHO. Ireland, Luxembourg, and the Netherlands benefit outrageously from this and since they can veto stuff it's really hard to plug these holes. I think Ireland gave up some ground in this regard since its position was starting to really annoy other EU members.