I'd simplify it even further and take the gamble and headache of difficulty/revenue out of the equation altogether by planning for a total Thash/s output - a lot of the other numbers will fall into place, and the toss-up depends more on how long you plan to be running the operation (operational costs will make one overtake the other) and what you think you can get for it on the market once you upgrade or shut down.