I would suggest that, if you are unsure of whether the testing of the circuit is valid with the shortcut being installed during the initial build it probably makes sense to build the amp stock, make sure it passes all the tests and then install the upgrade.