Yep, we had the same thing at that age. Personally I would introduce negative consequence for negative behaviour. I find dealing with tantrum after tantrum so exhausting that I really wouldn't be able to just ride with that all day. So I would probably use a time out, or negotiating (bribes :P) over activities/toys/treats. At this age I find children start to push those boundaries, working out where grown ups will say "no, that's enough" and they seem to be quite content with those boundaries, once asserted. I have only ever had to use a negative consequence less than a handful of times.