Actually, when I said you should swap the locations, I meant you should keep the upgrades at the same location, just switch the order in which they're obtained. For everyone who wasn't involved in the initial planning, the original plan was:
To which I pointed out that Uveto was ~7-8, while...