What do you take when the medication wears off?

I used to take two 20 mg quick release tablets of adderall a day. Now I'm on one 30 mg extended release tablet per day. I understand that the XR tablets only last for 8-10 hours. That's great for my work day but what about when I'm with my wife and kids in the evening? I find I crave caffeine to continue to stimulate my brain. 

Should I take my XR tablet later in the day?

Should I look into more longer lasting medication?

Should I stick with the caffeine?

(classic ADHD question) Am I overthinking this?