Yes, you can go to CPVC. Don't use female threaded adapters though. They are prone to cracking and leakage. Beware of Sharkbite couplers. Even though their website states they are code, most codes do not allow any type compression fitting to be used unless it can be seen at all times (such as under a sink).
if you have never made a mistake, you probably haven't done much.