If you still have your basic fundamentals from your junior and 20's era, I'd suggest finding good hitting partners over jumping into competitive match situations. Once you shake off the rust from your hiatus, then work with a coach who has an eye for strategies to take advantages of your strengths and hide any weaknesses. Only then should you dive in to changing the stuff that isn't working. You'll have a lot of positive momentum by then, which makes attacking problems a more positive process.
"I am also like Federer, but with a better backhand."...sureshs
Federer: "I am like sureshs, but my San Diego 4.0 NTRP backhand is weaker"???