Another exercise you can try is only playing "chord tones" while you solo. By "chord tones" I mean only playing notes in your solo that are part of the chords you are playing. For example, if you have a progression that is 2 bars of A major, than two bars of E major; than you only solo playing A, C#, E over the A, and only solo playing E, G#, and B over the E major. While this does not sound too exciting at first, this forces you to slow down and think a little bit about what your doing; which is not a bad thing. Here is a tutorial Anders Mouridsen did on this concept, utilizing the blues as a foundation;
http://guitartricks.com/tutorial.php?input=756
At any rate, those are a few examples that I think may help. Let me know if you have any more questions.
Douglas Showalter