I changed my /etc/grub.d/00_header and edited the recordfail section to:

if [ \${recordfail} = 1 ]; then
  set timeout=${GRUB_TIMEOUT}
else
  set timeout=${GRUB_TIMEOUT}
fi
EOF

Ran sudo update-grub, rebooted and it booted straight into Ubuntu.