Given all the do-si-doing that's been going on, might it not be thought to just "retiring" Safari and using a different browser (such as Firefox)? It would certainly resolve the frustration with this issue.