You want to basify the pfed, then take it up in a nonpolar, toluene and xylene seem to bee quite popular of late for basing out pfed, and to convert it back to the hydrochloride form, you could either evap the solvent and titrate against an aqeous solution of the acid, or rig up a gas generator, such as conc H2SO4 dripped onto CaCl anhydrous, this has the added advantage of drying the HCl gas that comes out.
Once the NP has been gassed, Pfed/epphy HCl will precipitate out of the NP in lovely white crystals.
You may want to try a second, third, and even fourth pull to maximise yield, although depending on where the pfed came from in the first place, certain polymers and other such obnoxious "gaak" may well have been included to thwart such purification.
And yes NaOH is the correct base to use to convert the hydrochloride to the freebase.
This information is just that, information, you said you were not making any illegal substances without the required permits and authorisation to do so, and this information is provided as such, for legitimate uses.
For further information, I refer you to the hive,
www.the-hive.wsThe hive, presided over by Rhodium has gotten the acid-base reaction, and especially purification of pfed down to an art form