Just a quick (kind of a) math question.... if you were 213# and 30% BF, how can you now be 172# and 25% BF? From your height (5' 8.5"), I would say 172 is kind of the bottom end of where your weight should be. At this point, eat more, and let the weight come back up, but lean instead of fat. Sounds like you have already cleaned up your diet, so keep eating whatever it is you're eating, just a lot more of it!
And kudos on the work already done, sounds like you've made a lot of progress