Blocks time is normal in civilian logbooks, but it's not strictly legal to simply add a margin on making assumptions - albeit that I know some people do that. My advice would be to forget about that, you don't need it anyhow as you have more than enough hours for any version of PPL, but even with allowables will need a lot more flying for any version of CPL.
My logbooks cover both civilian and military flying. I always logged in the military way for all of my military time, just have the occasional note in the summary reminding anybody reading the logbook of that. It's fine, honest, and unproblematic.
Going forwards though, start logging blocks time for all your civilian flying.
G