Disc brake upgrade questions

I WOULD use the aftermarket valve.

You want it in the line to the rear brakes, and you want it between the old distro block/ warning switch and the rear brakes.