Right on communism, wrong on socialism. Socialism is any poltiical ideology that supports worker control of the means of production. USSR was not socialist, it was just a beuracratic mess.
Mutualism, that is all. Oh, except you seem to be rather unaware of the economic calculation problem...