I have had the same desktop assembled by myself more than 5 years back and it still serves my needs. (although it is getting long in the tooth now) Sometime last year the original ASUS motherboard fried and I had to buy a new one. Luckily a Biostar model was still available and it saved me from having to buy new CPU and RAM.
So the way I see it is not exactly for upgrading CPU but also availability of things associated too. In fact considering the way I am, it is unlikely that I will upgrade CPU by throwing out an existing working one.
Considering all this will FM2 socket be the best bet? Being a desktop I would most likely always have a separate graphics card and for emergencies I would always go with motherboards having integrated GPU so not really interested in APUs.
FM2 has already been succeded by FM2+. Next series of APUs will have a new socket most likely.
The current generation APU Kaveri already has Steamroller cores. But it seems as if AMD is not planning to release Steamroller for AM3+.
For AM3+ I think, all AMD is planning to do is, stick with the current Piledriver for this year and also for the most part of the next year. And then they will change socket or unify APU and CPU socket. If anything is going to happen, it will happen in late 2015 or in 2016.
If you want to buy an AMD CPU now, you can go for FX-6300 + 970 chipset motherboard + GPU. FX-6300 is a really value-for-money CPU. Otherwise your only option is spending more and buying Intel.