But you're right about subsidies being the wrong solution. Delete the subsidies and improve price signals with demand based pricing like the Texas grid does. Then you don't need subsidies b/c supply and demand will drive greater solar adoption.
Wind power OTOH...difficult to make the economics work. Lesson in there...