I'm fairly sure it will revert back to "normal" non-overclocked state after the PR1.2 update. I've noted about this in my guide I believe. Check my sig.

And yes, OTA will work just fine. But I do recommend for everyone to perform major firmware updates without the N900 overclocked. This should just be common sense to anyone who performs the overclock.