Costochondritis from what I understand occurs at the interesection of bone and muscle (like in your sternum, or between ribs). I'm not sure I understand how pain when you swallow could be costochondritis.
Also, be careful about what anti-inflammatories you are taking. Too much NSAID can give you stomach pain/ulcers/reflux. You should not take them every day.