I think you've answered your question already.
The fixes you are proposing sound reasonable. Definitely go for the most flexible line you can get for the clunk as well as a reasonably heavy clunk. A header tank is often a good idea. What plane is it on?