Really not a lot you can do without throwing some dollars at it. I have a similar setup.... 21 open bow, 460, WJ, diverter. I replaced the wear ring (minimum you should do), and wouldn't think about doing ANYTHING else before a diverter. With a new engine on the stand, I couldn't even think about running a stock WJ.
Talk to Tom at JBP about building ya one O' these. Then you can put more go fast goodies on the engine, and have an optimized pump.