Right on!!!
Asking questions the right way, and in the right place…
At a glance (from my phone), you do seem to have almost all the bits you need…
Start here: TheLostBiologist Bucket and Post Processing Tek for Golden Extract
Edit: second reading suggests you’ve already done the majority of your homework. @Krative might be able to suggest an appropriate secondary solvent. 30% yield from hash is probably indicative of the starting material not your technique…