I was more referring to the consumer market, but ARM is definitely a possible threat to Intel in the server markets.
Although AMD is developing some interesting technology, as you mentioned, but it feels like they're just to bridge the gaps in performance between their hardware. If they do roll out the NEW FX chips in 2015, I might be willing to give them another look, but they've been boring as shit lately.
Maybe we'll see the two directly compete in the consumer market again, but the performance differences are quite sad.