Yes it could be an alternator thing. You didn't mention the mileage on your car but as the brushes wear down there is less tension on the springs that hold them on the commutator and at high rpms they start to bounce and lose contact. Hence the warning light. As far as the whine, my car has always had that since I got it last year. It starts at about 3500 rpms.
Karl
