Frequency and angular frequency sure differ by a factor 2*pi, but the unit for both is 1/seconds.
You may say that frequency is oscillationscycles per seconds while angular frequency is radians per seconds. Both oscillations/cycles and radians are unitless. Radians is a pseudounit and not a conversion factor. So while both are of unit 1/s, this is called Hertz for frequency only, never for angular frequency. So to state clearly that a frequency is angular frequency, you may add the rad and write rad/s, but you mustn't. Think of rad as being 1.
That said it should be clear that there cannot be an automatic conversion between the two by stating different units, as the units for both basically are the same. rad is not a factor *(2pi)!
You have to do it as you already did - divide by 1/(2*pi) if you want to see the natural spring frequency, don't do it if you want to see it as angular frequency. Both will be of units 1/s and be of different value. Its up to you if you like to change the units seen to Hz for the one and to rad/s for the other.