Greg, welcome to this group. While I don't know what foods or supplements might help, there is a general consensus of what might make it worse, including stimulants such as caffeine & salt. Others will disagree.
As far as it going away, I can't answer that but chances are it will get better.
Mike