I would recommend a factory reset. I've done it each time I received an update and it does wonders. I was getting disconnects after the recent update, so I did a reset and it's working great now.
On Marshmallow, it's under Settings - Unpair with phone.