Change to HV oil pump - your thoughts?

The only thing I WOULD recommend like others have said is get the heads done. Complete valve job. Don't skimp on that. It does not sound like you had that done. While they are off, it would be foolish not to . NOW'S the time. lol