No magic solution, I had headaches 4 months straight, what helped me is good diet, plenty of sleep and returning to full time job.
The most important thing though is to limit stress.
Coffee acts as a stimulant so it might exacerbate concussion symptoms, on the other hand it might help with fatigue and depression