Not knowing anything about your engine or what it just got back from; this is a real shot in the dark, but I would agree w/Dan and look at the distributor gear/shaft. Also, I would drain the
oil and look very closely at the old
oil and the filter (Cut it open). There have been a rash of distributor/
oil pump related failures and these symptoms are sounding all too familiar.