If you ever need parts/motors for your older engines, try here.
http://yardbirdtrains.com/index.htm (http://yardbirdtrains.com/index.htm)
Been there, Done that! Nice folks.
A great site for connectors is here. Now if we could get them to take orders under $100 per item.
http://www.omnetics.com/ (http://www.omnetics.com/)