I love coffee, but I've determined that consuming caffeine negatively affects my sleep even 6-8 hours later. I agree with your fixes, though my own rule is simply to not consume anything caffeinated after 15:00.