Thanks for the all the suggestions.
Rioght now I am looking at either the Korber or a model from Locomotive Works as they offer multiple stalls and are more modern looking. I haven’t ruled out making my own, but with time as a consideration, I am leaning towards a kit or pre-built.
As always, if there are any more ideas, please keep them coming.