I have the Ruggeized Grand Sabana and pretty much do the same as you do.
After folding it over, I tuck as much loose stuff under each flap/pole divided area on the long side of the tent.
Once this is done, I sit on top and cinch it down with the four side straps (I have an additional 2" foam...