To be honest your sheet is nice, but http://mining.thegenesisblock.com is much better.  But really the important part is not these tools, but rather an analysis of the difficulty increase, because at the end of the day all these calculators will do is spit out numbers based on the input.  Need to think more deeply about what numbers make the most sense to plug in