OK, it's time to play spot the motif!
The first place that the original motif occurs is in bar 22. Using and developing motifs can give a real sense of cohesion to a piece and it is a device that has been used as a compositional tool for centuries and with good reason.
Again, the main challenge ahead of you here is to approach the phrasing in the best way possible. It can be quite demanding to focus on those nuances but it is an element of musicianship which will take your level as a guitarist onto a higher plane.
I have purposely chosen to omit the pinch harmonics evident during the solo but please feel free to experiment with where you feel they are appropriate but again, use my performance as a guideline.