I really like the first choice. The warbonnet would be a service crew's worst nightmare...trying to keep the silver clean and shiny (black smoke and if it is an oil burner).
So far I have changed the feed water heater, removed the small smoke stack, moved the bell, added class lights, a flip stack extender, number boards and hand rails. I still have to add tool boxes between the trucks on the tender. And probably weather it some.