Fixing a leaky roof IS NOT "remodeling or improvement". It is "maintenance". Repair-wise that means DO IT NOW.
I'm not a roofer but I've worked with some. I can understand how "finding the leak" in a large flat roof can be tricky and "disproportionately expensive" relative to other building...