VORTEC coolant bypass

[chefk85]

Finishing up my L31 vortec swap. Trying to figure out how to route my heater lines and the bypass needed for the vortec heads.

This is the water pump I have https://www.summitracing.com/parts/g...make/chevrolet

This is the intake https://www.summitracing.com/parts/edl-7116

A little confused but heres the idea I had. Run a short line from passenger side pipe on water pump(I believe bypass line) to front of intake manifold under thermostat.

Run another line from drivers side pipe on water pump to heater core in(I believe its on the bottom of core?)

Run a third line from outlet on heater core back to intake manifold on top passenger side coolant port.

Should I instead plug that heater core return on intake and run it back to the radiator?

Am I right about the passenger side short water pump pipe being the bypass?

I'm having a hard time finding any info that doesn't contradict other info. Anyone done this before?

Thanks in advance
chefk85