Consider having the jib eased slightly first before the main in the little puffs, it can allow you to feather up without losing power, and therefore boat speed, out of the main. Overall good first upwind leg just should have made lay on that, it kept lifting you on the port tack so you could have gone further expecting the knock on starboard so you wouldnt have to tack twice! Hope this helps but fun video to watch!
Thanks for the tips, certainly something to think about, although the Merlin jib is relatively small so may not have enough of an effect. Yes definitely a few errors on the layline, we wouldn't have had to carry on long to lay, and we could also have identified we weren't laying sooner!