I think you still need to get people to look at the bottom of their engine trucks plus see if the diesel engine comes with a 3 / 2 switch if you are interested in trying to convert a 3-rail engine to 2-rail. Here is the reason why...
Out of the MTH 2017 Volume 2 Catalog, I pre-ordered and received about 3 weeks ago the following...
20-20810-1 CSX SD70ACe Cab #4849
20-20825-1 CSX AC6000 Cab #607
20-20827-1 CSX AC6000 Cab #696
You notice in all 3 cases I ordered the 3 rail version. All 3 engines have the 3 / 2 switch and have correct type truck (plastic - removal piece) to easily access the wheel sets. The SD70ACe engines are offered in both 3-rail and 2-rail. The AC6000 engines are ONLY offered in 3-rail version. I only run 3-rail DCS and don't intend to convert them to 2-rail. But unless the 3 / 2 switches in my 3-rail versions are not wired, they should be able to be switched to 2-rail and work.
However, one of the above post implies that unless you order the "-2" version, you won't get the 3 / 2 switch.