I think the gun variety is actually a bit worse than the previous game. Certain manufacturers don't make specific guns (for example, Torgue sniper rifles) so I've been seeing the same iterations of about 30 gun types and modifiers. It makes the loot collection really boring when you realize you're just basically going to be upgrading the same 8 guns over and over.
Playing: Dark Souls 2: Scholars of the First Sin Watching: Mr. Robot