I don't find Opus does a good job on the rewrite pass either, I delegate that to OpenAI models (I've heard Gemini is even better but don't have access).