1)The first case when the bandwidth is infinite result is correct. it is 2KT/C
2) When the bandwidth is finite, the assumption that G abruptly becomes zero is doubtful. I guess the bandwidth is finite because of the input capacitance of the amplifier. If that is the case, the integral of the noise PSD should from 0 to infinity. So the second phase also contributes KT/C noise.