Sleep problems with my 8 year old son

My 8 year old son has a history of sleep problems.  Since he was 2.5 he has experienced night terrors on and off and are getting better with age.  He has slept in his own bed his whole life although has had periods throughout the year when he has issues.  Last year, he would wake and couldn't get back to sleep in his room.  He had a sleeping bag on the floor in my bedroom.  We worked through that and got him back into his own room.  He just recently starting getting up and coming to our room and/or sleeping on the couch in the family room which I would not have a problem with except that I get up at 5am to run and am waking him up.  It is not the appropriate place to be.  He is trying hard but really can't get back to his routine!  Help!!!