Not sure about after 2012, my guess is Bernie has an out in the contract if Austin is not ready in 2012, he can just keep it in NYC.
I doubt he would want a race in Austin, if he can get what he wants in NYC.
Truth be told he was going to run the race in Long Beach, before Texas offered up...