Nice. But I notice that since you don't have an equivalent to "Oh, no" at the end of the final chorus, that means ending on an incomplete cadence -- though, wait, you could keep the implicit change into the relative minor which starts the chorus and end on a startling minor chord. Yes, that's it exactly!