If you are maxing your upper ball-joint, and you dont want aftermarket uppers, you can just get a power performance ballpoint made specifically for this. its angled to fix the issue, and its much stronger then stock, or stock replacement.
or you could get cool looking tubular upper arms.. your choice. I like the tubular uppers because they give you more room underhood.
im not really a fan of the MMW plate style arms, but they're very popular right now.
PP balljoints: