Yeah, I would really look forward to Division 2 if I didn't think there was a very high chance of it being another Destiny 2 where they make huge improvements to the game over the course of a few years and then go right back to square one for the sequel. I don't actually think it's possible for another game to be as bad in that regard, but the likelihood of disappointment is still there. Especially if they make PVP any bigger a part of the game than it already is.
I agree that the secret to enjoying The Division now is to never set foot in the dark zone (and only buy Underground if you feel the need to grab some DLC). They're doubling most of the drop rates of classified gear and making it not require PVP ass cancer to get enough Div Tech in that 1.8.1 patch in the graphic above. I've put another 120ish hours into the game just recently and barely have any classified pieces even after the first GE so it's definitely a needed change. It was especially annoying to get 4-5 pieces of Final Measure and DeadEYE last weekend, two sets I have no interest in ever using, but only 2 pieces of Lone Star. Going to be real salty if I come out of the Assault event without full Striker, and hopefully Reclaimer too should I ever feel like doing anything but soloing. Fortunately I pretty much always play with Tactician builds and I don't even think the 5pc is worth it compared to Barrett's vest and a HE Inventive backpack. Classified would be nice, but it's just ++gooder on the main stats.