That's exactly what i'm doing as well provided a V2 comes out. But they got a lot on their plate with characters and RO coming out in a year etc. we'll see.
Yeah, it'll be interesting to see how quickly they'll pump all of their Star Wars product out over the next couple of years
We won't see nearly as much merchandise for ROGUE ONE as we did TFA, but the licensees aren't going to sit on it, either.
EP8 will be another onslaught, though, and that's now less than 17 months away; with the first products about a year away. :-O