Just my 2 cents:
For added clarification and easy building I find important to have a Heavy Weapons Trooper Battlefront 2004/2005 (the existing one) and then the future Weapons Trooper Battlefront 2017. If the differences of the expected new character aren't that much maybe the current category could only have the additional features of the 2017 HWT (new weapons, new backpack, etc) like the IOC has done with the Rogue One ISB officer - they kept the ISB Officer entry but with a Rogue One add-on (3 changes versus the OT ISB officer).