Not at my computer right now but I would start with a sweep with guide curves. Next a loft with guide curves.
First, I would suggest you re-create your current geometry with a singular sketch and revolve.
Second, I would add a plane (if necessary) and create the 20mm boss off in space.
Third, I would (as Solid Air suggested) create a loft with guide curves.