Skorpy, I had such bad swelling that I was hospitalised for a weekend at 37 weeks.
I had no knees and old scars on my ankles were really painful because they were so stretched. In both legs too, but the left was worse. I went into spontaneous labour on my due date. It still hasn't gone away. They said it can take up to 2 weeks after the birth. I say go for the acupuncture, and start taking Evening Primrose Oil if you havent already.