The heavy bolt rifle should be moved onto the heavy as it's for gravis type armour, then the heavy bolter can take take a heavy role and the heavy bolt rifle more of a lighter support. 


This would also help the tactical with its bolter selection as the auto, standard and stalker options would have a better clearer use.