The first one is what he plays on the performance, but not exactly how he explained it/broke it down. When this happens the transcribers generally go with what is played on the performance. The second should indeed be a trill. Thanks!
Christopher Schlegel
Guitar Tricks Instructor
Christopher Schlegel Lesson Directory