I actually did this same thing, albeit from the other direction. Started with a fixed Gen 4 Whiskey-3 for my T3. Ended up swapping the aluminum forend for the polymer X-Ray forend, and absolutely love it. It shaved a bunch of weight off the nose of the gun, thus bringing the balance point back nicely.