YND,
The ammonia is probably from chloramines. Your idea is very good, for the ammonia.
Just so you know there are other reasons for RO water. TDS levels won't come down without either RO, DI or distillation. One of the best examples of a dissolved solid is salt, everyone knows it is...