920 heads - What Cam?

Definitely keep the 904. To change you would need a new driveshaft and a converter. If the 904 starts acting up, you can pretty easily solve any issue.