I think the current behavior is fine.

If there needs to be a change, my personal recommendation would be to delay the initial MODE request by 1-2 seconds in case you get opped within that time frame.

How do other popular IRC clients handle this?