YES. I personally suggest a metal impeller water pump since sometimes the impeller on the plastic ones (OEM) can separate.
If you're having someone else replace it, make sure they also replace the tensinoer and idler pulley. The motor mount bolts are also single use because they go into an aluminum motor mount.
Also, post moved to mk5 section since it's kind of technical.