They're both great options, and you can't go wrong with either of them (or both). If you love class settings and socializing, yoga can be a lot of fun. But honestly, either of them are going to help improve your flexibility.