Thanks. I think my problem was more basic. It was a bit dark when I was working on it, and I didn't realize until this morning when I took the ring off the pump that the two plastic tabs/clips are different widths, as are the slots inside the tank. Haven't seen this mentioned before as I read through the past threads or the Clymers, though maybe it's in there somewhere. I think when I get it all reassembled and turned 180 degrees in the tank, I should be OK. I was focusing more on getting the wiring routed correctly, didn't notice the clip difference while the ring was on the pump.
Thanks again, and maybe this will help someone else with the clips.
Fingers crossed that everything works when done.