Yes, the picture corresponds to what I have now, except that pump, filter, and diverter are about 8 ft lower. Also, as you said, I have a check valve between filter and diverter.

I also have an additional check valve on the heated water return, near (4) in the picture, probably to prevent backflow into the panels when the diverter is in the non-solar position. But since i am leaving the diverter in the solar position, that shouldn't matter.

Thanks!