I would say the use of bayonets is pretty obsolete as a weapon, per say.... There only real use is to scare the shit out of unarmed 'trouble makers'. Personally, i think if you have long enough to charge an enemy, even in fortified position, they have more than enough time to put a round in you. Where as in the Falkland they had a role to play, as the SLR was too 'hardcore', for lack of a better word, for that sort of combat role, the SA80 is perfect (more or less).
Of course, there was a good argument for sidearms with the SLR, but with the SA80 it has diminished that. I still think making sidearms standard issue would be a great idea, either the USP or the browning.
Anyway, back on subject, as for training in hand-to-hand combat, i find not getting into the situation which would call for it better, and if you do you can either Glasgow kiss, rifle butt or just spark out the threat. The other reason is that you can have as much hand-to-hand combat you want, and you will still get fucked over in the fight. Personnel experience tells me after 5 years of TKD and kickboxing, to which I was decent at both, one good hit and you still go down like a sack of spuds, with less elegance.