We perform a fit to the full data set corresponding to 33.3 kt-yr of data of the Super-Kamiokande experiment as well as to all other experiments in order to compare the two most likely solutions to the atmospheric neutrino anomaly in terms of oscillations in the νμ→ντ and νμ→νs channels. Using state-of-the-art atmospheric neutrino fluxes we have determined the allowed regions of oscillation parameters for both channels. We find that the Δm2 values for the active-sterile oscillations (both for positive and negative Δm2) are higher than for the νμ→ντ case, and that the increased Super-Kamiokande sample slightly favours νμ→ντ oscillations over oscillations into a sterile species νs, νμ→νs, and disfavours νμ→νe. We also give the zenith angle distributions predicted for the best fit points in each of the possible oscillation channels. Finally we compare our determinations of the atmospheric neutrino oscillation parameters with the expected sensitivities of future long-baseline experiments K2K, MINOS, ICARUS, OPERA and NOE.