Rear washer bottle replacement for a 1980 celica

I have a 1980 celica supra. The rear washer
bottle motor needs to be replaced. I see
access to the tank filler neck underneath.
And I know about the panel to fill the bottle
and the two mounting bolts but there is no
way to get it out without destroying the trim
and maybe still not. It is surrounded with
foam as well.  I only need to replace the
electric water pump?
Thks. Dan