In reply to Andre.

I'm just skipping this phase altogether and going 100% blocks. That's obviously not an option for folks making a living from themes right now.

For your excerpt issue, this Gist might be of some help if you want to make sure that you're only targeting the main query on the page.