I've always used steel shim sealed around oil returns with hylomar as you tried.

I would just tube the return holes in the heads extending them into the block.