I would like to do a JJP tour, but the only thing I am going to see is a WOZ machine being built perhaps, where as If i go to Stern, there could be anything up to 4 or 5 different models all getting built. Its a tough one to answer at the moment, but Stern Factory tour is lookin good.
Then Disneyland plus Magic Mountain, LA is always good for a visit.