Good news is you are now familiar with the format of the test. I was out of school for 11 years and took WRE. I had on-demand EET and SoPE and studied for a year+ prior (originally I was going to take Oct 18, then Apr 19, but life got in the way).
I think your major downfall the last test was...