[troyb]

We default to WebArchive if the page has any attachments (like images) and page source if the page is flat or if you're looking at an image etc.

Safari appears to remember whatever you had selected last and it completly ignores what you have set if you try to save an image (it just saves it as a regular image even if you have WebArchive selected) so I'm not sure they have the better solution.