I'm assuming you went to Nick's Trains on Glenwood Avenue. He's a good guy and can also do repairs for you. He also offers used stuff. I've been buying stuff from him for a couple of decades.
I like your idea of buying a new Lionchief set, or maybe Lionchief Plus so you can also operate it the traditional way. Most of my engines come from sets and I just add other cars as I find them.