A big chunk of the "subsidy to non-renewables" is support for heating for the poor. This allocation is by virtue of most generation being non-renewable. When we move to more-expensive renewables, this support will be bigger and will have moved to the renewable column. So, it's not really a subsidy to non-renewables.
This is just a couple of things I noticed - you need to be alert to creative accounting when it comes to renewables, because many people tend to be motivated by ideology rather than numbers.