I always heard that the Shotokan version of Unsu was from Gigo Funakoshi and it was based on a version he learned from Mabuni. The version from Aragaki called Unshu is very different that the Shotokan version.

I have even seen some groups calling the Shotokan version Funakoshi no Unsu and the Shito one Aragaki no Unsu.