Except, as you can see in my log, doing the upgrade without it already installed finished the aborted build, installed, then uninstalled and started trying to re-build/install again?

If you aren't using archive mode, and you turn it off (as it's now off by default), the upgrade target will be 'destroot' and things should work like they used to.