I've always personally found that the nightshade restriction is a bit much but I would either remove as little as possible (and then keep taking away things one at a time) or remove everything at once and start adding things in one at a time. That way, I can always tell what affects me the most. If you remove the bare minimum and then take away things one at a time, it kinda works the same as the other way around :-). If that makes sense....
On another note, the sunrise alarm clock is some of the best money I've ever spent. I highly recommend one!! Especially if you need to wake up at odd hours. That alarm clock will mimic the same kind of light no matter what time of day it is.
Living the primal lifestyle and loving it! On a constant quest of optimal health and living life to the fullest :-).
You can have excuses or results -- not both.