Understand about cleaning reports but if the OP rate shops and improves his cost ratios right now would he not be better off than he was. While at the same time he could work on the repairs you suggested. It costs nothing to rate shop and you can change companies later on and again rate shop. All I had to do for rate shopping was to have my declaration sheets so the coverages were set forth and the insurance agents could then use their systems (they do all the work) to compare and give you the results. SImple and essentially painless. In fact I used to do it once every few years ... now I do it every one to two years and it is amazing how insurance companies adjust rates (example they got hit hard with home owners losses from hurricanes and they jack their rates to recoup some of the loss).