Simple principles you may know (with little tweaks you may not):
1) Plan work and private events together in one calendar, using time blocking.
2) Track how long things actually took, to offset planning fallacy. Try Pomodoro technique.
3) Review and adjust without feeling guilty about the past.