I'm also a chem... journeyman, so to speak. But I think you may have something mistaken here. I was under the impression that the freebase of a chemical is not, in fact, able to be dissolved in water. Although it's possible that some freebases may be able to.
In any case, whether or not the freebase is dissolved or just floating around in the water in tiny particles, the procedure for turning it into its salt form is easy, especially the citrate salt. Get some citric acid, pure crystals is the best and easy to find in a health food store, but also lemon juice would work. Drop it in slowly, stirring the solution. If indeed the freebase is dissolved into solution, then I don't really see why you'd bother converting it to the salt, but I'm not sure if there would be an easy way to tell aside from cheking the PH - a freebase is strongly basic (high PH above 7), while an acidic solution would be below a 7 PH. However, as is most likely the case, the freebase will probably not actually be dissolved but will instead be floating around as free particles. In this case, drop the acid in dropwise, stirring, and as long as the citrate salt of the chemical is soluble in water, you will see those particles start to slowly dissolve into solution. Keep adding acid until it's all dissolved. The good thing about a citrate salt, as opposed to say a hydrochloride salt, is that you're using an acid that is completely safe for human consumption, so if you use too much, you'll just have a strongly sour solution. Putting too much hydrochloric acid in, on the other hand, could be unpleasant.
But please don't take my word on this. I believe I'm correct but I'd like to know myself!