SOunds like you are on the right track.
OME seems to be a generally prefered choice on 3rd Gens. If you need more height you can add a spacer or so. But on the 3rd Gen you might have to drop your front diff an 1" or so.
Discos seems to be the easy fix for extra flex. You are lucky, as in the 4th Gen I'm still scratching my head how to get more flex. You can't disconnect the swaybar up front on a 4th Gen without destroying the CVs, you have to remove the whole swaybar.