Considering the price of electricity will continue to rise, I think your PV panels will pay for themselves over time.
I can see why solar thermal would make sense depending on whether you use natural gas or electricity to heat your water. If you use electricity to heat your water, I could see how solar thermal is more efficient.
This stock is slowly dropping again. It needs a run. Undervalued imo.