How many OUs do you have? dozens, hundreds? If the conditional job was too complicated you could just have multiple image jobs - Image X computer for X ou, Image X computer for Y ou, etc.
Hardware independent imaging makes it simpler if you can do that, though setting up each job is a little annoying (shame cloning doesn't work better for jobs).