i didn't really have either until the end of my pregnancy with my 1st baby. but i started have braxton hicks with my second at 14 weeks, which scared me to death, but my dr. said as long as i didn't have more than 4 an hour that it was fine. and i started swelling right around 20 weeks, just in my feet and legs. it was only every so often though. but sometimes it would feel like i was walking on balloons.
My first pregnancy I swelled like a balloon for the last 3 months because it was so hot and humid and I don't recall having braxton hicks. With this one I have been having bh for a few weeks now (i'm 28 1/2wks) and a bit of swelling but nothing to bad. Only when it gets real hot or I am on my feet too long. My arms get real puffy too, they look huge when they do. I hate it, but I guess there isn't much I can do about it.