Dave,
Good catch on the O54 switches, but I think the bigger issue is that the 21" coaches might not traverse those switches very well at speed, or at all. My recommendation would be to change to O72 switches at the minimum (except for spurs the passenger cars will never used), but my preference would be to use all #5 switches which should insure that all mainline separations stay at 4.5" minimum.
Chuck