You have it covered.
I had a rocker arm issue that I probably wouldn't heard if the engine had been in the car and would've lead to damage. We heard it and shut the engine off and found and fixed the issue then continued on. In my case it was $450 well spent and that included 7 quarts of Brad Penn motor oil. Plus the guys at the engine shop were Mopar guys and we had a great time hanging out and shooting the breeze. It was a great experience for me.