Keep the new system but instead of using up and down to cycle the types of target just make it so you have to hold a button down and press up and down to change the type. This way you can still use up and down to target as normal including self target, that I like to do to stack buff's before a fight and still quickly change to a different type without doing it accidentally.

Easy fix ^^