Is this a gallbladder problem?

It first started when I was pregnant and was having severe pains that would last anywhere from 5 minutes to half an hour. I was terrified at first that it was something wrong with my baby but was assured it wasn't by my OB and by a PCP who both said it was probably because the baby was pushing all of my intestines together and making them not work as well as they used to. The pain was in my upper abdomen below my rib cage and felt like trapped gas almost. I would take tums and though it helped sometimes other times it didn't. I am now 3 weeks post partum and I have had the same pain twice in the last 3 days. It's more pronounced beneath my right rib cage now and the last time I vomited from it. I thought it may have been a bug at first but gallbladder problems run in my family. I've also been having random headaches that come on quickly and once I take an ibuprofen, go away. I am just wondering if these are symptoms of gallstones or gallbladder problems or if this is left over issues from having my baby? Thanks in advance.