Here's the loco (same Leviathan that didn't have any hardware changes in the first image), but now with a balloon stack from an MTH Railking 4-6-0. A Premier-worthy riveted balloon stack is probably in order, but even this is a nice improvement. I know MTH makes the proper spoked tender wheels for other 4-4-0s, but I don't have the strength today.
Keep in mind there's a distinction between the Carolwood trains and the park trains, along the lines of the distinction between The Walt Disney Family Foundation and The Walt Disney Company. Still beautifully intertwined, but not exactly the same thing -- for licensing and such.
Todd