I would agree. It needs to become more like buddhism and focus on the spiritual aspects while going offline in the social, jurisprudence, and political arena.
Sufism (tasawwuf) is the way to go! Unless the inner dimensions of Islam are sound, it will never reflect well on the outer (political, social, etc.). This is why Islamic regimes like the one in Iran always fail.