About ten years ago I had the same problem; I foolishly ignored it for several months and ended up having surgery, where the doc scraped bone tissue to remove the impingement. I tell you this to stress the point about how serious this minor ache can become, if not properly considered.
Now to your question: I'd say you're absolutely right, and maybe not going far enough to say 'pain free'. As you know, certain angles of repetitive motion are what aggravate the problem and increase the pain. "Certain angles' and 'repetitive motion' sound exactly like lifting to me. So I'd suggest you avoid lifting until you're all good, but also go another step: Add the stretches you're doing to a couple of exercises to strengthen the area. You can find some examples at these sites, although you may all ready have some from your doc or therapist.
http://www.physsportsmed.com/issues/...96/nirscpa.htm
http://www.the-essential-pain-treatm...nniselbow.html
I can tell you that if I had to do it all over again this is what I'd do. In fact, when the elbow on the other arm started acting up it's exactly what I did, and I haven't had an issue with it in years.
Good luck.