You're going to have some smoothing errors with your current edge flow. I'd also add another layer of edge loop on your cylinder cap, but that's more of a personal preference, it makes it more flat with a sharp edge instead of this weirdly light-ish ring around the edge. Don't be afraid to make the detail floating geo if it messes the smoothing to the point where working a way around is well, too much work.
Also get some high res ref, from looking at your details, you're using a low res ref that doesn't show alot of the details well.