You can switch to consumption-based usage and bypass this all together but it can be expensive. I run an enterprise account and my biggest users spend ~2,000 a month on claude code (not sdk or api). I tried to switch them to subscription based at $250 and they got rate limited on the first/second day of usage like you described. I considered trying to have them default to subscription and then switch to consumption when they get rate limited, but I didn't want to burden them with that yet.
However for many of our users that are CC users they actually don't hit the $250 number most months so its actually cheaper to use consumption in many use cases surprisingly.