Structure i think is fine, better to have a late finish than getting the push or fold situation much earlier than now.
Much more play now, so better all round.
7pm rather than 8pm, to the masses, I should think is a better solution to the "late" finish.