Very impressive. You are working at another level.
For what it's worth. My opinion is that nothing is gelled yet, if you think you have a better way,I'd do it your way. Zaps ended up pretty messy and complicated, would be a shame to make that mistake again.