Well, this would affect CD and Nabeshinji since those are the two returning teams that had the highest picks last year. What I could do:

Split the drawing into two parts, teams and draft slots. Let's say, for a simple example, I pick Nabeshinji and 1. That'd give him the first pick, but since he had it last year, I would put it back into the piles. If I happen to draw it a second time, then it would be official. Would that be fair enough?

This would basically affect four teams: Nabeshinji, CD, Del Murder and RSL.