If you do move to hub v2 I would recommend using my Hue app and DH’s [UPDATED DECEMBER 2017] Hue B Smart (Groups & Scenes) which will give you hue groups/rooms which will remove the popcorn effect you are seeing.
I would also recommend moving from smart lighting to webcore