I think your solvent choice is the issue.
removing the ethanol will also lose you a significant portion of your terpenes.
which will make your desired consistency harder to achieve.
although not impossible