The best way to fix this is to eliminate the S-box lookup, thereby making AES constant-time.

For example: http://rd.springer.com/chapter/10.1007%2F11935070_14