Hi coda,
That would be the best thing to do, I believe. I'm sure that WA wouldn't want to penalise anyone who has already spent hard cash on various constituent extensions just because they weren't bought as part of a suite.
I hope you get a good result, and that perhaps the criterion for 'upgrades' can be clarified by someone from sales.
Hope all goes well!