Here's another take I find useful when explaining things to others; there are exceptions, of course, but I think you'll get the idea:
All aqueous corrosion is galvanic. What sets up the galvanic cell is how we further categorize the type of corrosion.
Uniform: caused by microscopic & fluctuating dipoles.
Pitting and crevice corrosion: caused by geometry
Galvanic: aused by different materials.
etc.