Mapping based on OU would be easy as long as you have no legacy clients. Just assign a GPO logon script to the OU. This is covered in AD101.
_________________________
Give a man a fish and he will be back for more. Slap him with a fish and he will go away forever.