I have the four core model; I'm not sure for my work flow that faster CPUs or more cores would really help much compared to the cost. My SSD upgrade has really given it new life in terms of responsiveness.
Thanks for the link to the workaround. Hopefully it isn't something that will get broken with updates.