For heating, photovoltaics supplying a heat pump is starting to give direct thermal a run for the money (well, not actually for the money yet, direct thermal is still cheaper, but at least in terms of how much you could harvest from a given roof area)

If money isn't an objection at all, e.g. if you strive for that sense of achievement of a good setup, there are hybrid modules that pick up the 20% or so photovoltaics achieves and still funnel the remaining energy into heating a liquid medium.