I started with CBC (without MAC) and upgraded with GCM since it was a more convenient way to provide integrity without adding the MAC step manually.

I should really make sure IV/Salt are regenerated automatically after use. (there is a small print warning in the creator about reuse)