I just had a CCV failure as well. Based on what you've posted... I do think you're on the right track. Replace all components and hoses/clamps if necessary. After replacement, consider an oil change and then do a nice long drive to get oil up to temp and oil running through the new CCV.

__________________
2002 X5 4.6is - Titanium Silver / Black Alcantara - Dinan Stage 2 - Bilstein/Eibach - Brembo BBK ----SOLD---
1993 318i - Brilliantrot / Tan - bone stock daily driver