Thank you both for the studio models, I wanted to see if I could modify the locomotive to address the common aesthetic complaints. I made the pilot deck and pilot a stud longer, added another headlight, spaced out the drivers, changed the domes, and a couple other small changes. It now more closely resembles a Bavarian 4-6-0, with some details from the blue S 3/6 sprinkled in. It's not complete, but enough of a visual change to discern it from the original.
Here is the inspiration: