There are different views about the grammatical form:
The American Heritage would agree with you: whichever. The American Heritage® Dictionary of the English Language: Fourth Edition. 2000.
Cambridge and Oxford call it a determiner:
Cambridge Dictionaries Online - Cambridge University Press
However, I would not use 'that' in the sentence.
Student or Learner