Yea as said before the longer you wait the better. You will not get serotonin syndrome or nothing dangerous will happen. How ever MDMA's residuals are still making you not in your best mood / depressed. That will affect your trip and unwanted thoughts will slip into your mind easier because of this, so up to you but waiting longer would be wise.