I would much rather have a designated marksman role (probably 4 slots and a 5th whitelisted) , and get rid of the marksman weapons you can have as a rifleman.
Also limiting what scopes certain roles can have, such and medics, engineer and rifleman don’t need scopes anything past X6 magnification.