Up front, it will never be more economical as buying a new machine (as your basically swapping out everything), we do plan on doing a rail upgrade to gen 2 when we can figure out how it makes sense.
If you want the Gen 2 stuff, you’ll never beat the black friday/cyber monday pricing there is right now.
Personally, I can’t believe how affordable the new Gen 2 is. for me it made much more sense to buy the new gen two than to upgrade through the IPP. My suggestion is do it before it is gone forever.