That's great - I did really well with IF for a while too.

The only advice I had on the cramps you're already doing (magnesium) - although I have read that the type matters a lot, it needs to be a chelated form, or the oil (which isn't really oil, it's transdermally absorbed and apparently feels greasy).