Not going to get an easier anytime soon. You are going to have to bite the bullet like the rest of us did. How much easier do you think it could get??
There is still 14 subjects to do. Most of the ones I did were pretty much as helicopter specific as you could get, with exceptions to a few.
I wouldn't be waiting around. Any written tests you do in JAA land are going to be tougher than the FAA commercial written.