I think the long term plan was for the 19xx arrival from South Wales to still split even when its a 5 car. I think the 2030 is meant to be the only 2 car booked working out of Manchester to South Wales? So the 1930 would be the 3 car set after the split.
Anyway, good to hear all 4 diagrams...