Increasing voltage noise but decreasing current noise with rising resistance
I think you're comparing two different physical situations. (1) is for voltage across an open-circuit resistor, (2) is for current through a shorted resistor.