Yes the full feeling will subside, slowly. Have a thermos of water beside you all the time and every 5 minutes or so take a swallow. Ice water will help with the swelling. Don't force more in than you feel comfortable doing. When I started two swallows was all I could take and now I'm at 4 swallows about 8 months in. Be sure not to drink even one swallow of water/liquid when eating until about 2 hours after eating. I'm serious about that. I found when starting to eat solid food that chicken breast cut up into bite sized pieces and boiled in chicken broth until just done was the easiest to eat and had the highest protein content.
