Can my irrigation be (easily) improved?

@robertokc Based on the 1st picture, it looks like my existing setup is what you’re referring to in #1, correct ? It also looks like I have a different valve for the grass than the other 3 drip zones. I can’t tell the brand. Based on all of this should I look at option #3 or is #2 still an option ?

Thanks!