Amazing research man, great job! Can't wait to see the new calculations with the yet-to-be-released chips.
Anyway, if I am reading this right, ROI of 1 S9 will be 1 year (if the current BTC price remains unchanged) by November 2018.
It is more than highly unlikely to have the same BTC price by Nov, so I think that all S9 owners are pretty safe, right?
Safe is relative to how much ASIC hardware will hit the network by then. Additionally if your objective is to accumulate more BTC then it seems like a small risk at this point. I also factored the max difficulty before it would become unprofitable.
However it seems like a good offering.