No matter what you do you'll never get the upgrade to be as good as the FN2.

But you should do the upgrade to provide some inspiration.