I heard taking plenty water and being active are ways to combat swelling. I don't know much about feet being sore. Maybe you're on your feet for too long?
It's completely normal try getting some insoles I'm 33 weeks and I'm just now getting that feeling again one thing you can do for your feet us lay in bed and elevate your legs and for sleep it's completely normal it will go away until you get to your 7th month it comes back