I also use a transport rule the same way you do.
You can write your own transport agent to manipulate the header in a better way.
Microsoft is conducting an online survey to understand your opinion of the Technet Web site. If you choose to participate, the online survey will be presented to you when you leave the Technet Web site.
Would you like to participate?