The question is, will the "short upgrade" be a "short upgrade" in a few years? If it ends up not being the case (which has happened to a great deal of people), then you'd really be frustrated with putting in all that, well...frustration. Upgrades swing back and forth with about as much volatility as the stock market at the airlines, with just a few exceptions, in my opinion. Given your choices, I'd go with QOL, or build time until you have a few more options.