Hello Pete,
Some lovely work on the locos there, sorry to hear of the frustrations with the presflo wagons, it was something I was following with interest as I have been looking at these on the society pages with a view to having a go.
Yes I agree, your locos should be in Mixed Traffic.
Best wishes
Eric