My opinion: When you go solid roller you should really take advantage of the profiles only a solid will give you (very steep ramps, etc.) And if you do that, you really should do it WITH new heads, as you mentioned.
Don't bother unless you can also do the heads at the same time. I'm a fan of AFR, but Brodix are nice. However, if you want to chose one or ther other- do heads first.