You could just change the thermostat and see. I did my 530 and it's not really bad at all. Draining the coolant is annoying, but if you only drain the radiator its not so bad. You could switch to the metal thermostat housing while you're at it.
It'd save you a ton of money and might solve the problem.