Yes.  I'm thinking that rather than have "auto-invest deposit addresses" and "regular deposit addresses", you just have deposit addresses, but there's a setting on-site for "auto-invest new deposits" which you turn on or off as you like.

When a deposit arrives on any of your deposit addresses, it's auto-invested if that checkbox is checked.

Would that work for you?