Old timer 4-4-0 tender coupler conversion.

[Bobndwoods]

I'm new to the forum, so this may have been covered, but I can't find it anywhere.  Specifically, I have acquired a 4-4-0 Old-timer (PRR) and want to change the tender coupler from the T-shank Rapido to a magnetic knuckle.  I tried installing the Micro-trains 1049 as they recommend, but it doesn't sit at the right height and the amount of shimming it takes to get there makes the coupler not work right.  My question is this: Do the Bachmann EZ-Mate Mark II's work in that tender pocket?  Or, do they (or someone) make a T-shank coupler to fit in the Bachmann pocket with the old spring?  Finally, has anyone had success mounting a Micro-trains assembled coupler pocket to the underside of this type tender?  I'm also a little new to N scale, BTW.