That's from 3 years ago. Who keeps all that in their head? It would be helpful to post the engine year if it's different from the truck's year in the question.
So the bottom line is that the OP should use the adapter plate to relocate the pump and the stock fan will work and everything will line up correctly, right?