After re-reading everything.  I would look into the headlight, and brake light grounds under the dash.  They seem to be tied in together.  So, maybe one or the other are loose.  Sometimes, they use a single ground wire for multiple items.