You may need to do a miss a meal basal check and work your I:C again.
Have a read of this thread on TAG.
Square wave or combination. The idea is you would bolus for the carb, then 50% bolus for the protein. This will vary for how your system works.