I'm not convinced that redefining Pi as 2*Pi would cause an equal amount of complications (besides confusing everyone with the change). The radius is more fundamental to a circle. The diameter is just derived from the radius. The idea of a circle with a unit radius is so widely used that it is simply called a "unit circle" with the obvious implication that the radius is what the "unit" refers to. Every time I've done math with radians, the fact that Pi is only half way around has added a subtle but noticeable disconnect. I have to force my intuition to fit the definition.
The radius is only more fundamental to the notion of a circle because of the modern definition of a circle (set of all points exactly r away from the given point). One could also use a definition like:
"Continuous set of points such that each is distance d from exactly one other, and further from none." The modern definition is convenient because it's a special case of a convenient definition of ellipse, but there's nothing terribly fundamental about it.
And yes, every time you've done math with radians, that problem has haunted you. That's because we decided to use radians instead of "diameter-ans", to keep with the above definition.