An easy solution to the Arizona law is to neutrialze the percieved racial component of the law. Make it routine that officers must ascertain the residencey status of all persons stopped by an officer after "legal contact", not just those that they suspect are here illegally. I don't think it would stop profiling, but it would lessen the constitutional scrutiny.