Your list is a perfect subset of mine. Transitioning into no caffeine has revolutionized my sleep and productivity. One additional point that has really helped me a lot is realizing that I should never eat anything within 2 hours of bed time. It took me a while to connect the dots on my waking up at 12-1am back to having had eaten half a pizza at 9pm. Anything with a delayed action like that is very tricky to keep an eye on. This is the principal reason I dropped the caffeine. The effects/side-effects just became too unpredictable.