Thanks guys.
I am now looking at the Velocity A23 rims, which have an ERD of 601mm. This should work hopefully for replacing both the Aerohead at 602mm and the Aerohead OC at 598mm.
I will take out the rim tape and have a look at the spokes. Maybe take some pictures and post here.