I would choose # 3 because there are a lot of new goodies at Universal since your last visit, especially the two Harry Potter lands. I would try to visit on weekdays, when most wait times are short. On weekends, they suddenly grow much longer. If you go on non-holiday Monday-Thursday, you won't even need the Express Pass, so you can stay at low cost hotels in the area instead of Universal hotels. Then maybe you could afford to make your Disney trip a longer one.
Halloween Horror Nights are very good, but be warned about two things:
a) they're scary, unlike the Disney halloween parties.
b) the wait times for the mazes/houses are even scarier, unless you shell out a lot more for the front of the line passes.