Is a CrazyDevy upgraded G1 Devastator now your Neo-Classics Devastator?

I've been rearranging figures here lately and realized this. My G1 Devastator with all the CrazyDevy upgrades that are currently available seems like a better choice for my Neo-Classics shelf than the official Classics Devastator. He's pretty much screen accurate now with lots of articulation. Articulation that will only increase when the next upgrade ships. Obviously he would fail if disassembled into the individual Constructicons, but as Devastator he outclasses the Energon repaint. Now I kind of want to get another G1 Devastator so I can have one original version on my G1 shelf and one upgraded version on my Neo-Classics shelf. I'm hopeful the same will hold true for Predaking when all his upgrades are done especially with the reissue coming out later this year.