We re-examine the equation of state for the nucleonic and hyperonic inner core of neutron stars that satisfies the 2M⊙ observations as well as the recent determinations of stellar radii below 13 km, while fulfilling the saturation properties of nuclear matter and finite nuclei together with the constraints on the high-density nuclear pressure coming from heavy-ion collisions. The recent nucleonic FSU2R and hyperonic FSU2H models are updated in order to improve the behaviour of pure neutron matter at subsaturation densities. The corresponding nuclear matter properties at saturation, the symmetry energy, and its slope turn out to be compatible with recent experimental and theoretical determinations. We obtain the mass, radius, and composition of neutron stars for the two updated models and study the impact on these properties of the uncertainties in the hyperon-nucleon couplings estimated from hypernuclear data. We find that the onset of appearance of each hyperon strongly depends on the hyperon-nuclear uncertainties, whereas the maximum masses for neutron stars differ by at most 0.1M⊙, although a larger deviation should be expected tied to the lack of knowledge of the hyperon potentials at the high densities present in the centre of 2M⊙ stars. For easier use, we provide tables with the results from the FSU2R and FSU2H models for the equation of state and the neutron star mass-radius relation.