swollen and miserable

I'm 38 weeks & 2 days. For a week now my feet have been ridiculously swollen. I drink a ton of water and put my feet up every chance I get. I don't eat any salt! Even staying off my feet, the swelling barely goes down. The swell in has moved up into my calves and you can tell it is all just fluid from my knees down pretty much. It's getting really painful. I checked my bp and it is 129/87. I know the systolic number is perfectly normal but wonder if the diastolic number is a little too high. I also weighed myself today and noticed I gained about 10 lbs since last week. I just feel miserable. I keep getting annoying pains under my ribs on the right side.. but baby is still very active. I finally have an appointment tomorrow afternoon & im hoping things are moving along. I'm so ready to meet my little boy and have all this random crap stop!