Without knowing your exact situation and goals, it would be difficult to give you advice on what to add or subtract. However, I think that warm-ups should only last about ten to fifteen minutes (including some chromatic dexterity excerises) just enough to get your hands limbered up and ready for the real work. I would definitely recommend that you add theory back into your routine (it keeps the "knowledge" of what you are doing fresh in your mind).

I do agree with most Superhuman's post, especially on composing structured solo's. I would add working on one or two songs from your repertoire for at least a half an hour and change up the songs on daily basis.

As far as number of times to play a lick through... until you get it at a slow enough speed to play it perfectly without mistakes. Then, continue to up the tempo until you got it dead on the proper speed.