Don't know about switching formula because we b'fed but DS was very similar and we also had success with Infants Friend.

Baby massage can help too, as can a nice deep warm bath.

Hope you both get some relief soon, we found that DS grew out of it within a few weeks.