I can sympathize.
I heard my pump wheezing and panicked. My YJ is my daily driver and (at the time) only streetable vehicle. So I picked up a new pump and went home to replace it. With no assistant, I unbolted the pump, dropped it onto my chest, then slid out from under it. After getting everything disconnected, I discovered that I have some sort of oddball tank and pump that doesn't match ANY pumps that any of the parts stores carry.

Since the Jeep is my only driver, that tank went in and out 3 times before I gave up on replacing it. That was a year ago now and I haven't heard it making any noise since then. Someday soon I'm gonna have to deal with it, and I'm gonna wish I had that access plate. I'm also gonna need to figure out where to get that replacement pump...

[edit] Oh yeah, I also changed the fuel filter at that time, first time since I had it, so I'm sure that helped!