i know julian they both same
trouble is we are all trying to get something that cant be got in a 2d drawing, i know you dont want cross over pipes, spiols look,
trying to match real thing and on a pic will get very messy and hard to read/understand so i think the easy way will be to go with yours, although pipes dont look like the real thing they are, its down to the builder to plumb where they want in theory it works, so all good...