That's more than enough on the instrument math side, most of what you'll see is pretty mundane stuff, unless you end up on an exotics structuring desk.
I'd also note that JS and other MMs mostly don't do anything requiring you to know the intimate details of these things, a lot of it is understanding how the market works rather than the deep instrument math. That might mean other kinds of math of course.