I don’t think you can fix the degeneracy because there must exist points that are independent of the azimuth angle. This doesn’t necessary mean anything’s broken, there’s just not a unique representation. θ = π/2 doesn’t necessarily mean dθ = 0, which would only be true if θ(t) was constant.