Washer Pump Replacement Help Needed

[golf4dj]

I have been leaking washer fluid for a bit as the low fluid sensor keeps coming on. I thought the leak was quite large but it is not but it is a consistent drip.

I have removed the wheel protectors and I can see the fluid container and the pumps. The leak is clearly coming from one of the pumps. I am just not sure I have enough room to pull the pump out and replace it without removing the front panel. I also don't see how I can remove the fluid container without removing the front corner panel either.

Anyone done this before have any suggestions/hints or am I simply left with pulling the panel.

Thanks,
DJ