They changed the cup draw for the better a year or so ago ..it used to be +2 or +3 levels that you would meet
As for the Champions League it has always been +1 levels as long as ive played.Higher levels get +2 levels in the Champions league