Yes, you're right. I was hesitating trying to squeeze the intro at the end of the song with a coda sign, but I decided not to add it on purpose just to have a chart easier to read (avoiding uneven bar spaces especially when there are some chords on the 4th beat). Your chart is useful to play the entire form along with the player.
I've suggested to the feature requests thread to add a rehearsal mark that could play a particular section as both intro and outro, just to avoid writting a same section twice in a song.