I developed tennis elbow after getting my first smart phone about a year ago. I've since ditched the smartphone. I've seen improvements from using a small keyboard at work (I'm right-handed so this helps as my right arm is now in an ergonomically sound position on the mouse).
This goes to show that it may not be heavy lifting that is the main culprit. Small repetitive movements can be more harmful (no sniggering please).
After developing tennis elbow, which was very acutely painful and clearly very localised, I stopped weight training for a few months and wore an elbow brace. The worst agony was reaching up to pull a clothes hanger off a rack while shopping. It was pulling at particular angles that killed me - I could feel something tearing. Now the pain is occasional and minor by comparison, so that's a big improvement, but I haven't cured myself of the injury completely. However, it is manageable, and I am able to continue with upper body weight training. I avoid very dynamic movements though, e.g. kettlebell swings. I have hypermobile joints so this makes me more prone than average to this type of injury.
Eating a very anti-inflammatory diet should help - perhaps taking probiotics could help rebalance your gut flora and immune system which might help?
It's good that you are looking to take action sooner rather than later to avoid this turning into a serious chronic condition.
F 5 ft 3. HW: 196 lbs. Primal SW (May 2011): 182 lbs (42% BF)... W June '12: 160 lbs (29% BF) (UK size 12, US size 8). GW: ~24% BF - have ditched the scales til I fit into a pair of UK size 10 bootcut jeans. Currently aligning towards 'The Perfect Health Diet' having swapped some fat for potatoes.