Looks good to me. Calculation is correct. Although you might want to add to #1 your description; that the width of the rectangle is the circumference of the circle (w = 2πr) and that you add the surfaces together to get the total surface area.
total surface area = area of rectangular part + area of circular parts
SA = 2πrL + 2πr²