S- and P-wave K+p scattering below 600 MeV/c