Chemical evolution with rotating massive star yields II. A new assessment of the solar s- and r- process components