Is singular 'they' a better choice?

"Everyone should do his or her best in whatever situations he or she happens to find himself or herself in?" That's awkward. Perhaps everyone should just do their best in the situations they find themselves in. Even if their best involves they as a singular pronoun.