@Dub9 I went through a similar exercise a couple of months ago. If you have some time you can scan this post to get some ideas:
Going to the MP Rotators was a huge improvement for me, but I’m sure some of the others you mentioned have the same benefits. Do consider that any rotators will have a much longer run time due to the lower flow rate than fixed heads. For me my run times increased by about 4x. If you have a dig needing to use the space it may be an issue, but if not you might saved quite a bit do to less runoff due to better control, and a better efficiency due to less missing as stated @ronjonp.