Presuming you have a nominal profile specification for the surface (within some tolerance), measure the surface profiles before and after heat treat in order to see if they remain within the specified range or even change. If the results are consistent, you may be able to adjust the pre heat treat processes to tune the surface (if needed) based upon how the profile ends up after heat treatment.
Regards,