Yes, from your drawing, it looks like that would work.

I'd recommend that, if you can, you remove the solar heater loop connection completely, and pipe straight to that return, so you can have full use of the circulation system.