wget has an option to convert links in downloaded websites: --convert-links

I don't know whether it covers both your issues, but a test can't hurt.