I would say that 48oz of water is not enough also (you don't need fruit juice, and if it'll help you drink more water, just cut it out completely, if you can!).
Swelling is totally normal during pregnancy. It doesn't really matter what your body has done in past pregnancies - the fact remains, swelling is normal during pregnancy. It isn't always an issue. If your blood pressure is normal, and you aren't having headaches, or other symptoms of preeclampsia then it is just normal physiological swelling. You can rest, you can drink fluids, and you can have the baby - then your swelling will be done! =)
FWIW, I am 38 weeks, 3 days. I drove 1200 miles to visit family (2 day trip) when I was 33 weeks with my 4 children (no husband! he's in Iraq!). I had no swelling prior to the drive. But my ankles were slightly swollen at the end of the first day of driving, and they were GROSSLY swollen after the second day of driving. In fact, I was swollen from the calves down. It was horrid, and uncomfortable. It scared me - I thought maybe my BP had taken a turn for the worse!
I got to my destination and I swelled every single day. Keeping my feet up and resting and drinking tons of water helped, but I swelled every single day!!! It was bad! I had my blood pressure taken 2x when I was there, and it was totally fine!
I went and bought the diabetic compression socks ($30!!!!!!) for the drive home just to alleviate the swelling, and let me tell you - they were worth every darn penny of the $30! I had minimal swelling the first day, but the second day I had NONE - and those were 2 days of in the car/on the road for 10 hours each day. No swelling! So - if your legs/ankles are bothering you, you can go spend a pretty penny on the compression socks (most good drug stores will have them), however, I haven't worn mine since I've been home, and I haven't had the gross swelling either. I think the climate change was the big factor in my swelling. Is it getting much warmer where you live? I changed climates from 30-40 degree highs to 70-80 degree highs. Quite a difference really.
I have had my blood pressure checked 2x since being home, and it's totally normal. So for me I know it's normal physicological swelling. It is likely for you as well.....every pregnancy is different. Drink a little more water! Especially if it's getting warm where you live. Good luck!