Pac was always decked out in jewels even before Death Row dayz, (why he got robbed for his jewels/etc in New York) he just emphasized it more once on Death Row. and became more arrogant while on D.R.
While he was locked down, he was mad at Biggie not only for possibly setting him up, but for trying to live his lifestyle (mafia lifestyle, champaigne, jewelry, etc). Pac said he exposed Biggie to that lifestyle and Biggie tried to copy it.
So, i think Pac always had a thing for jewelry/armani, etc. He just had so much more to him, that he didn't need to talk about it as much.
But to the thread question: I don't think Pac would have joined Death Row if not going to jail, he probably would have stayed on Interscope, then retire/concentrate on acting more. Maybe help people like Outlawz,etc but keep a limited role in the music business.