I read somewhere that Jill's Theme is supposed to play to the end and Cheyennes Theme plays after screen goes black. But I'm not 100% on that.
As for the rising scene, honestly it never bothered me before but after reading about it, it makes sense to leave it out. The tavern scene would play so much better without it.