I definitely agree that the Horn Jon found (Sam in the show) with the dragonglass is the actual Horn of Joramun.
As far as the theory goes, if it does play out like that I hope Sam doesn't die. I like him (which is, of course, all the more reason for him to die in this series
).