I think the main difference is that cupcakes have icing, but muffins don't (and are also larger)

Bearing that in mind... CUPCAKES. The icing is the best part!!!