Well Vishera just got released on AM3+, so I am not sure where you received your information from. Also, Steamroller supposed to be released in AM3+.
FM2 is not an upgrade to your current system, especially when you are not going to use the on die graphics card. Might as well get vanilla AM3+ cores instead. You can try to unlock your processor for now. Intel is not that much more expensive than AMD, the cheaper i5 and motherboards are not too much more expensive than AMD, you gain very good gaming performance but loses overclocking ability (small price to pay since you don't seem to have overclocked your current chip).