What you think to include seems fine to me. My supervisor always says that in a science PhD, first you say what you will do, then do it, then say what you just did. It sounds boring and repetitive, but this is pretty much what the reader expects.
I would also advice you to stay away from the thesis for a while, then re-read it and write the take-home messages. Don't include too much detail, I assume they want to see the bigger picture.
Well done so far!