Very similar setup to what i'll be running on my 7a 20v...
The physical diameter of the tanks fuel pickup plate is 65mm so realistically any in tank pump that is that diameter will be relatively easy to install.
Having the jdm tank already it'll have the baffles which should prevent surge. Just add some gates fuel hose to lengthen the pickup (if required) to ensure it sits at the bottom of the tank where the baffles are.