Yes, you are both right; but Grover's is much harder to run than Shor's, so signatures are the most vulnerable, then 160-bit hashes. 256-bit hashes are very very hard, and might require a truly enormous computer to be competitive with ASICs. But once those achieve advantage, miners will just upgrade and in 2 weeks or so things will be alright again.