You were "lucky" to have gotten 25k on a CF after upgrading the HPFP. Most having done that only get 10k to 15k/CF. Yes, you should've replaced the CF at 10k miles the first time...which was hopefully a brand new CF at time of HPFP-upgrade. When my HPFP was upgraded, I let my VW tech do it at the same time he installed my K04, injectors, FMIC, exhaust, and all else. I thought he installed a new CF and expected to check the CF after 10k miles. But he reinstalled the old CF that had 58k miles on it. After 5800 miles the same thing happened to me. I was lucky that I let my VW tech do all of my installs and they covered it all with the warranty, but the bill would've been between $2k and $3k usd.
If the intake cam's hpfp lobe doesn't look like it has a mirror finish and flawless surface...I suggest replacing it to get the most out of your future CF's. I know some just leave it alone but you will not get the full CF life from now on unless you change the intake cam. Mine used to wear the black off the CF-face, and deform its flat surface, after just 10k miles and now it's getting closer to lasting up to 15k miles. The HPFP upgrade means you have to be religious about CF attention.