Invest in a good pair of insoles. Go to a specialty store for runners - their employees are often better trained to determine exactly what you need for your feet, your gait, and your activity level. Mention the swelling to your provider at your next appointment, they may want to keep an eye on it and may be able to give you some tips. Good luck.
Im a massage therapist so Im on my feet all the time so yea u can wear comfortable shoes but do not get a foot massage there are endangerment sites in ur foot that can cause complications
When you get home just soak your feet in salt water that is the right temperature for you that helps me good luck