Being a member of that hardly exclusive and not elite club, and also having taught FIBUA/MOUT or whatever you want to call it as recently as 2016, I generally agree with most of what you posted. But very much disagree that not much has changed; it has changed a fair bit since I joined in 1985 to when I retired.
You are correct that there is still very good reason to continue to have the ability to affix a sharp pointy object to the end of a bang stick. We are increasingly training troops we expect to be likely to be doing house clearing to draw their pistol if they fire their rifle to slide lock or have a FTF/FTE. BUT, we have yet to arm every designed hajji killer with a sidearm as well as their rifle.
As far as that goes, if that fight happens inside a place the size of a grape hut in Afghanistan and your rifle malfunctions, the most likely way to survive that fight when you're at spitting distance is to immediately go mad gorilla with what you already have in your hands - your rifle, with or without bayonet.
And yes, you can beat the hell out of something with an M16/M4 and it will not shatter like your Gramma's fine china. It may not take to it as well or as many times as a Lee Enfield, a Garand, or an FN SLR - but the gun plumbers will give you another one.
But tactics like stacking and then mouseholing with water charges and other innovations, fighting down from the top instead of fighting up from the bottom... there is a continuing evolution to make winning that fight less costly.
I expect, and will not be surprised, to see a day in the near future where urban ops house clearing is done via an infantryman carrying a lunchbox sized box containing a small swarm of tiny drones, each just big enough to carry enough explosives to kill an enemy combatant - and the technology to recognize and sort armed combatants from civilians within that structure without control of external operators.
But that infantryman will still be carrying a bayonet - and his rifle will still have the bayonet lugs that allow for it to be mounted. Unless some penny pinching geniuses like the ones that decided the F4 Phantom didn't need a cannon in the age of nukes and rockets gets involved.