I recently noticed a puddle of washer fluid on the ground every time I came back from a drive. The pump worked ok and managed to pressurize the nozzles but not for very long. After a few days the pump stopped working. Not sure if the pump failure and washer fluid leak are related but it's too curious of a coincidence... I checked the washer system fuses located in the driver side dash board. They checked out ok, which tells me the pump might be dead... Moving on, I jacked the car up, removed the front driver side wheel, removed the inner fender lining. The washer tank became visible but couldn't figure out where it had leaked from. I tried to remove but it seems to be sandwiched between the car's sheet metal and the driver side intercooler ducting.

My questions:
Am I on the right track here by planning to replace the pump and its grommet?
If so, how do you get the tank out to replace the pump? Does the intercooler duct need to be removed?

Anyone experience this??

Thanks gang!