Gassy baby

My LO is currently on enfamil Gentleease neuro pro and is just way to gassy all the time. Well tonight it's so much worse and I just feel so bad for him. Over the last week or two we have tried gas drops and gripe water. Gripe water was a definate no for him and gas drops helped for maybe a few days. From my understanding there is soy in the gentleease and I am wondering if that's what is causing the gas. Maybe we should switch to the regular yellow can enfamil neuro pro? Our doctor visit is on the 8th. Any recommendations until then? Should I wait to switch? Thank you!