I'm going with Nas, because he's just too unique to give Tupac the edge on him.
I agree, Tupac is a lyrical genius, and he's good at what he does. But what's special about him? His flow? Mimmicked, and mastered by hundreds already. His lyrics? Yes, they are something, but Nas is just as...