I know you've made your choice, but it just dawned on me when I looked up at the currently month in one of my PRR calendars in the office that the PRR G5 might make for a closer model with less work. You could put that trailing booster truck under the rear of the cab.
Random thought.