At the recording level, I’ve always used producer and IIRC that’s been the same with all the hip hop editors I’ve interacted with. For what it’s worth, quite often (although certainly not always) a hip hop producer is not just a beatmaker but also does a lot of other things, including a lot of traditional producer-like elements.
At the work level, usually a producer/beatmaker should get a composer credit, yes. As long as we’re sure they did write the music, anyway, and it’s not a non-writing producer credit.