Dealing with extremely long tracks

Right now I am preparing my first ever psytrance set , I have played mostly bounce and hard trance in my life sets before but I am kinda freaking out despite being very happy with my song selection .

I have a timeslot of 1,5 hours and right now I sit at 15 tracks I want to play and doing a rough guesstimate with the song overlaps thats a playtime of about one hour already filled .

For reference my last Bounce/Techno/Trance Set took me ~40 tracks to fill the time Slot?

Is this normal for the genre or should I start digging for shorter Tracks? Any ideas on how to keep people on their toes when a 8 minute Track is playing or should I just trust the music. Its meant to be psychedelic so no hectic Transitions are probably deseriable for the mood