As I re-read your post, you are asking about what is more important- upgrade time or FO pay.

If you chose upgrade time as the most important, wouldn't FO pay just kind of work itself out all by itself? IE- FO pay is not that important if your upgrade is quick.

In any event, I think you have answered your own question. You have alluded that financial stressors are less of a concern for you. Knowing this, I would submit that maybe the real comparison you are seeking is Upgrade Time vs. Quality of Life.