The noise your getting when you turn the hot tap off, after running off some hot water, will be water hammer caused by the ballvalve in the bigger tank that feeds your hot water cylinder. Get that replaced, and that should sort it.
Don't know whats causing the other noise, but don't think its...