I think if you are going to be a singer, you should sing. If you are going to be a dancer, you should dance. If you are going to do a combination of the two, you should make it very clear when you are singing and very clear when you are dancing.
But filming is good for you, because the crew isn't allowed to laugh. You can't get addicted to getting the laugh.