Changing the head unit should make a major difference. Changing mine out made everything clearer and tighter.

After living with it a little while, you'll have a feeling for what you want/need next.