Glad to help. Sounds like you're on the right track.
If you go the rebuilt route, be sure it has the oil plugs in the ends of the shaft. You may need to shift everything back and fourth on the shaft a little to get each rocker centered over the valves.
I always set the lifters, then start it up with the cover off and watch for oil to drip from every rocker. Then run the valve lash again, just to be sure.