Looks like could be right to me but difficult to confirm without seeing more, I assume what you have labeled as boiler flow just goes up and back down to pump. And yes that will be a bypass and should be open very slightly, nowadays auto ones are fitted instead. As for the above post, boiler primaries don't actually mix with the water that is drawn off.