Rather than focusing on the favicon, I would like to suggest that there is more site-level metadata than merely a tiny little icon, and thus something like the sitemaps standard should be extended to add the notion of a favicon, and then a header be introduced to refer to the sitemap.
This way in the future, when someone wants one more thing in there, it doesn't mean sending two headers.