Hi Cyberius,
No one can answer that question for you definitively, unfortunately.
You have two primary factors at play: you and the product.
I don't know how badly you abused MDMA, or whether the diminished effects/hangovers you experience were primarily due to your abuse or to other factors.
I highly suggest that you test your beans at a lab. If you cannot access a lab, then test them with a full reagent test kit.
It is my personal opinion that there is a lot of shit product out there that looks okay, even through testing. However, there is also a lot of great product out there. To increase your chances of having great product, definitely test it.
If you have taken it easy, and you get quality product, then you should be able to have a great time after such a long break. But, there is always the possibility that you will get sub-par product.
I hope you have a fabulous experience.
-indigo
