Yes you are correct about the parts diagrams showing the newer can motored versions. It's been so long since the upgrade that I don't believe the parts department even has the pancake motored trucks anymore.
I own at least a dozen of the can motored GP40s, and I like them alot. These versions, there are several slightly different ones, have corrected the problems that plaguesd the pancake motored units: poor electrical contact, lack of pulling power due to only one truck being powered, rubber tires on the powered truck in an attempt to increase pulling power, a motor that didn't hold up under heavy usage.
If you decide to rebuild the one you have, you'll be able to find another one at a train show to use for parts. But you'll still be dealing with the drawbacks of the original design.
I own at least a dozen of the can motored GP40s, and I like them alot. These versions, there are several slightly different ones, have corrected the problems that plaguesd the pancake motored units: poor electrical contact, lack of pulling power due to only one truck being powered, rubber tires on the powered truck in an attempt to increase pulling power, a motor that didn't hold up under heavy usage.
If you decide to rebuild the one you have, you'll be able to find another one at a train show to use for parts. But you'll still be dealing with the drawbacks of the original design.