The question about rental property and Hurricane Harvey is mine and I have still not received an answer.
As far as the other question: I'm using the paperwork from the adjuster to file on my 2017 taxes as payments to the contractor will come out of the insurance money. Any additional costs accrued in 2018 that are not part of the insurance payment will be reported on an amended 2017 return or reported on my 2018 tax return.