I very much agree with this version as it does not render junctions irrelevant and adds some complexity.
Junction and flow direction should very much keep some importance and in this way it seems easy to marry the new fluid system with some level of realism by splitting connected pipes into segments ...