Another tip I always use for engines that have the oil pump driven by the bottom of the distributer is to fill the crankcase with the proper amount of oil and then use a priming tool in an electric drill and rotate the engine by hand with a socket and breaker bar through 4 or 5 revolutions. Even though I lube the heck out of everything as it is assembled I don't chance having something drained dry.
Stored engines get the prime / rotate treatment once a month also. For storage I usually fill them with inexpensive 5W30 and change to a more normal grade when it is to be fired up.