E8248 for the pump, or a Bosch 044..... I have the first, the second will be what I do next.
You'll need at least a 19x22 double pass "chevy" style radiator. Run a surge tank style system and it'll take care of itself. A bigger rad is better but you can't always fit it and for a trail rig, it's not worth worrying about.