I have two suggestions for macros:
1. Could you change it so macros that end in a "+" assume 0 if no input is given.
2. could you make macros on the macro bar drag-able onto the chat, i.e. I have an attack macro that ends in a +, I charge so I wish to add to my roll so I would drag the macro into chat and enter the 2. This would let you have readable names for macros and make them usable quickly, alternatively to dragging maybe shift or CTRL click.
At the moment to get round not having this functionality I use two macros for everything a short named macro with a + at the end (ie #at) and a long named macro that just calls the short one with a 0 (ie #attack).