Hey Adam, speaking of Roll20, about the weapons that can be used one or two handed. Have you considered setting the first damage field as a d8 with the type "(1-hand) bludgeoning", and the second damage field as a d10 with the type "(2-hand) bludgeoning"? I've been using it in my games and it works great, you just have to get a declaration from the player before they roll the first time which mode they're using. It's much more flexible than having one macro that you have to keep changing or two different macros.
The only downside is it won't work for a weapon with additional damage (extra elemental damage or whatever), since the second damage 'slot' is already used up with said additional damage.
Here's what the output looks like, it's really clean and makes it easy to keep the flow of the game going, as well as allowing the player to switch it up with no hassle if they need to grab a shield or hold something in their off hand.