Yes as you've mentioned you need to be shoving this pre so shallow. Once you get to the flop you're so shallow so it's hard to do anything really but c/c works despite him seeming commited with the cbet as you keep Ax in his range, and yours which when you c/r you're never getting to call (maybe AKs). In this case wih how shallow stacks you both were always Gii so put it down to a cooler and move on.

Disclaimer: you haven't specified but if this was on the money bubble I still think you're too high up in your range for it not to be a shove. But don't trust my word, run some equity calculations which will help you much more.

For this stack size you should always be getting it in pre man
As played, you've gotta shove the flop too.