Very much luck with the build man.
FYI: Type R, GSR, LS fuel pumps are all the same after '96.
Good luck on the build. May want to do a wire tuck while you're tearing it apart. Even if it is only a mild job.