That 6-3800 is a great loco. I usually run mine with the separate sale PT Tender and the matching CC2 Empire State cars. I love the detailed interiors, it's one of my favorite trains to run.
I suspect when the one of my two 6-28084 20th Century Hundson's returns from an overhaul by a certain forum member and upgrading genius that my 20th Century set will supplant the Empire State as my favorite.