too much noise and too many leaks

I reckon you might want to have the block decked and the heads mill just enough to keep from blowing the gaskets. if you're getting any water into the cylinders it doesn't compress very good. use new head bolts or studs.