One step at a time my mate.
Also when you do the diaphragm there also the none return valves.
They sit in the block a certain way, these are something else that can leak but definitely check the diaphragm first as they crack and leak air from the pump to atmosphere.
Patience young jedi, the...