I agree the Pain and the Fear were awful. Fighting the Fear in the dark would've been so much more thrilling... The Pain is hopeless though.
Or you they could have forced you to fight him before you got the Therma goggles and you would have to rely solely on sound... but then I guess it would have taken away from the awsomness of the battle with The End.