try it with out the dump valve, that will poss stop it stucking unwanted air in and stalling

but the clicking is it poss a different fault eg speedo cable (not related to the another one)