Is there something about the additional evaporation/remixing step that causes waxes to precipitate out the second time?
Edit: BTW, I got 2g of great looking (to me) light amber oil out of this. 20% yield. I dissolved it in 30mL of 95% Everclear.
The first pull dealt with both the 5% water in the Everclear and the remaining plant moisture. After that has been evaporated away, , using only a 5% water solution will dissolve less polar material.
Sounds like you are on the right track! 20% amber yield is respectable. My best using quick wash was 21.6%, and although I have seen higher yields using alcohol reflux, they were chock full of inactive ingredients.
Good job! Have fun!