You can use an R6 body but you have to swap all of your parts over to the body. Plug the return, swap the PR, swap the fuel meter... Pumps are the same but if you know yours works, use it. FZ6R should work too.
Search for the fuel pump PN on this forum and you'll find a list of interchange parts...
JJD952 fuel pump should find some info too!