PMS is tough! Especially during these difficult times, it's like all the worst feelings just come up from nowhere. I've been looking to balance it for years now, and only recently got it down to a day. At one point it was month after month, then when I saw a naturopath, it all started to calm down. Took a year though to get it down to 10 days. It's now just a day or two.
It takes about 3 months for the results to kick in, but what I found was the best was very high doses of calcium. 1800mg a day - everyday. It has helped soooo much I can barely believe it. But, be consistent and patient with it. What also helped a lot was blackstrap molasses - 1 tsp a day. Take the molasses in the morning and the calcium at night. The molasses has iron so it will help energy levels while the calcium keeps you calm and relaxed in the evening. No point in taking them at the same time as iron doesn't allow calcium to be absorbed properly anyway.
This was one of my H's complaint of me - my PMS - and I worked hard at getting it under control. Still, it was never any fun for me and wanted to sort it out anyway. I was actually getting close to seeing a hormone doctor too because I just couldn't stand the sleeplessness, bad dreams, anxiety out of nowhere, - you know the drill.
BTW, your sitch sounds like it is moving in a positive direction - well done you!!