id just replace the pipes with samco ones or sfs which ever,and go for a crome headertank,cos they will always end up swelling cos there only plastic!