Using total energy consumption (not just electricity) and redoing the calculation using entire incident solar flux, I get that they are within a factor of 4 of each other. I agree that the sun currently dominates and the co2 capture is the dominant mechanism. It's also interesting that our consumption is so close to the same order of magnitude. It suggests that if we were to heavily invest in e.g. nuclear to solve our carbon issue that the heat alone would be on the same scale of excess energy and heating would continue. It also says that for solar to solve the problem we would need to cover something like 5-10% of the land mass in solar cells!