As far as which setup will "pull" better, what counts is the torque at the rear wheel. Torque at the rear wheel divided by the wheel radius gives you the force pushing the vehicle. More force at the same weight will "pull" (actually push) better. How does HP play into this? Take the RPMs at the wheel and use torque to calculate the HP from the equation mentioned earlier, and the most HP wins.
The trouble with comparing HP, is that rated HP occurs at one point in the engine RPM range. Unless both engines is at that RPM, you can't use the rated HP to predict performance.
Another issue is that diesel engines are turbocharged, so once you get to a higher elevation, gas engines will have a significant decrease in HP, whereas the impact on a diesel engine will be minimal.