Yep that was the plan and thats how it is now working, stayed up late to finish it for you.
The reason why it was a little more complicated is nothing is hard coded any more and Cairenn or any Admin can enter a new patch name and give it focus so I dont have to update it any more. So I just needed to plumb that data into the SVN / Git backend and make the needed changes to the push_zip db table. Then the code of course needs to take into account anything already set by the user and merge in the tag changes which is the easy part.
The reason for the multi tier system is more for the transition phase on patches or beta's. Some may want to release an update to their addon that both works on live and the ptr and mark it as such. Although like I said above this system is more for Cairenn so she can enter the patch name and reset flags.