I have a limit on what I can write here in the comments, so I wanted to also say that of course Raqs Sharqi has evolved in places like Egypt and Lebanon and the music changes too, but Raqs Sharqi style will always have that traditional component to it in its orchestration. It may no longer be a full orchestra playing, it could be synthesized but it will follow a structure using more modern sounds like keyboard. You may hear all the rhythms you mentioned within a song used for Raqs Sharqi. The best way to get familiar with it would be to watch those Golden Era dancers and hear the different songs they danced to. We still dance to modern versions or covers of those same songs today. Shabbi would not be considered Raqs Sharqi per se, it is its own style. Also, all the westernized versions of Bellydance like "tribal" are also not Raqs Sharqi. I hope this helps. It can be a bit confusing but over time you will develop an ear for it.
Replied on Belly Dance Gold: Fundamentals Of Raqs Sharqi
14 Nov 09:12
I hope to work on that very soon