I would try put the headshunt beyond the yard points (to the left) (perhaps use a double slip in place of the first point?) This will allow all of the yard roads to shunt in to the headshunt if needed
Lovely improvements lads
What kind of space do you have? If you could extend the headshunt (in yellow) it would let you assemble trains in the yard too