Sounds like you're having a lot of fun.

The purpose of the rifle and how you intend to use it should dictate the type of gear and optics. Without that nailed down, you'll be endlessly bouncing around like a ping-pong ball between 1x red dots and 24x scopes like you are now. Take a deep breath and define the role of the rifle. Range toy, self defense, hunting, bench shooting...

For example-- are you one of those guys who wants to sit at a bench and agonize over how accurate your groups are on paper, or will you be shooting offhand and want fast target acquisition.. or or or...