Yes, that is what your amendment to the AP&S would do. The developer gets a slightly higher unit value (helps when asking for the construction loan) and you get Tarion protection for the upgrades deposit provided your within their restrictions.
If you ever buy new again, during your 10 day AP&S...