Ok the problem returned... I showed the issue to a buddy who has the same phone and it also turned out that I was missing several options on the camera. I did a factory reset and the problem persisted.
I think I found the issue... I was using Google Now Launcher. Apparently that launcher doesn't play well with the camera. I uninstalled the launcher and voila, all the features (video, zoe, dual camera,etc) are back and the camera no longer closes after taking a pic.
Anyone else want to test this theory and see if happens?