Wow, that's quite a problem for first-year chemistry!
I'm not sure I follow your experimental plan so far. How do you plan to use either the HCl addition or the NaOH addition/distillation to tell you have much ammonia or ammonium you have in your initial sample?