That looks like a fun layout to run. The H16-44 looks like the perfect sized engine too. I like all the different switching areas. Hopefully, a longer drawbar will take care of your steam problems.
If you want a diesel with sound, try the trainmaster from Atlas. I just got one a few weeks...