Everybody should buy what they want...
Personally my shotguns are for hunting or for clay targets..not dedicated for Defense / but I have no problem using a shotgun with a 28" or even a 30" barrel for defense ( not optimal for a "Fighting shotgun" ...but just fine for Defense) in my view. In the M-4 Benelli, I think you have one of the best Fighting shotguns available today. I don't see the attraction to the M-2 Benelli / its not a bad gun ...its just not as good a "Fighting gun" as the M-4, in my opinion.
My 1911's are my primary carry or Defense guns ...but a revolver is a good choice as well ( I like S&W revolvers - like a K or N frame in
.357 mag ...model 19, 66's ...or 27's in the N frame). N frame fits my hands the best ..and I like a tactical revolver in a 4" ...easy in and out of a holster. Another good revolver is the L frame, model 686 ....but if you like the Rugers better...then you should go that way.
But if it were mine, I would keep the M-4 - and buy another shotgun for hunting and clays ( like the Benelli Super Sport model - I have one in 12ga and one in a 20ga / 12ga is a 30" barrel and 20ga is a 28" barrel ) both nice semi-autos, both have comfort tech systems in them...nice guns if you want a semi-auto.
For a good versatile pump gun....I like the Browning BPS Hunter models..12ga and 20ga ...mine are both 28" barrels. Good solid gun, long term gun ...relatively inexpensive these days for under $ 600.
( you can take the plug out of the magazine on a pump gun or a semi-auto and most any of them will hold 5 shells at 2 3/4" long ...load with slugs or "OO" or whatever you want ...and its certainly a "Defensive shotgun" in my view.)
My primary bird guns / clays guns ..are all Browning O/U's ...and I like the Citori XS Skeet models ( in 12ga, 20ga, 28ga and .410 ) for good all around shotguns.