I'd also wait until you move before getting it sorted mate.
Explain that ot the insurance company as well: say you're fed up with the damage but don't want to get it resprayed until you decide to get it done once you're away from them.