Avoid caffeine, and change your REM cycle. You should start moving your bedtime forward or backward depending on the time you'd like to wake up, to the point that you wake up on your own just before your alarm would sound. The best sleep you'll receive is when you wake up on your own after your R.E.M. cycle. Which is why when you take naps, sometimes you feel worse because you've awoken in the middle of your R.E.M. cycle which is when you get the best and most rejuvenating sleep.
