Can you not divert before the boiler ie engine/pump/unloader/3 way to boiler or cold . Just have two push/quick releases... one hot and one cold. As you set up at the job you could either set up hot or set up cold...or it would only be a case of unplugging the hose and throwing the lever to change between the two.
A non return valve will always be problematic....keep it simple!