Speaking personally as someone who usually gets enough sleep, I'd much rather wake up of my own accord than by alarm. If I wake up within an hour of my alarm, I just get up.
Try a sunrise simulator alarm. It will gradually turn on the light 20-40 minutes before the wakeup time, relying on your body to pick it up and wake up more naturally.