Where did you source a new pump? I searched far and wide but could not find one...
Valve clearances done when cold, but this info should be in the workshop manual that you are hopefully following. I took mine in to a reputable shop for the valve clearances as they had spare shims in stock - if you dont have the correct shims, it is a 2 week waiting period for BMW to bring them in which can make it a lengthy process...