The arrangement in post #11 might be your best bet/.
Regarding my pic in post 10 -
Could I put a 22mm Equal tee in on the horizontal line, just above where i've marked it, then run 22mm pipe back to header tank. Then cut the 15mm pipe downstairs in the airing cupboard and put a stop end on it?
I'm confusing myself