Having work on this with helipilot77, I would recommend this mod to anyone doing this swap. Makes things WAY easier!
Thanks for all your help and encouragement. I got my pump in and running beautifully. Just some wiring clean up left to do, but she is driving very well.