I've used the NWSL universals on my tender drive steam 2-6-0 and 4-4-0, and also on an emergency fix for an Atlas Century 624 with split universals. A little rough and may need flash removal, but good material.
I've also removed/bypassed all the 'feeler spring wire to post' tender to locomotive connections I can. The post corrodes, there's a tiny, tiny point of contact, it's just not good. Use some flexible wire from miniatronics or leftover DCC decoder wire and work around. I've drilled 00-90 and tapped and put in screws for one end or the other as the preferred way if it can be found a place to do it.
