You can take or leave any of the suggestions implied in this but it's how I'd be approaching markup, using the first section as an example...
Merging down your edits; I took a stab at marking up one section the way I would, take from that what you like.