I honestly found it much better to create a new db for 10.11 vs migrating. Both took about the same amount of time but the fresh db has no issues and the migrated db has some hiccups like you described (and some others). Main downside is you lose watch status