Here’s some comparisons - 3rd Rail Q2 and J1a tenders:
3rd Rail Q2 and I1 tenders:
Lionel made a pretty proper 210 F-84 for their TMCC and later J1as:
So maybe Lionel could use their own 210 F-84 tool for the new ex-MTH Decs (close enough?). I hope Lionel got the Q2 and the M1b from MTH (Lionel's J1a is a bit nicer IMO). As much as I'm attached to my 3rd Rails, replacing them with modern Legacy versions would be OK with me over the next few years.
Here's a link I saved a while back: http://www.wsbcos.com/tenders.htm