I would definitely spend two days in Disney - there are two separate parks which usually require one day each. Universal takes one or two days depending on the queue times - in two weeks it should still be reasonably quiet.
I can't help on the shopping front other than to say there's a small shopping plaza at Hollywood / Highland between the Kodak Theatre and the Renaissance hotel. The Beverly Centre is supposed to be quite good too. There's also a shopping street outside Universal called CityWalk although it's not for clothes, accessories, etc - it's got an odd selection of shops. Well worth a visit at night though, the atmosphere is great. I'm not sure if it still applies but at least one of the bars used to do a 'buy one, get two free' drinks offer on cocktails. (No, that's not a typo!) If your trip happens to coincide with a concert in either the Hollywood Bowl or the Universal/Gibson Amphitheatre, they're both fantastic venues.
In Hollywood, Ripleys Believe It Or Not and the Kodak theatre are worth a short visit and are both on the same intersection. Hollywood is still very run down so if you're going expecting stars and palm trees, you could be somewhat surprised.
The Queen Mary is permanently moored at Long Beach (south of LA) and is apparently worth visiting but I haven't been myself so I can't say.
If you have time to kill and just want to walk around and see the city, try to visit the Central Library, Union Station and the Bradbury building in downtown - they're all beautiful.