HK Parts.net is showing they have German, US, and KCI metal mags in stock. I've bought from them and haven't had any problems. The MP5 is listed in the rifle section.
My short ETS mags act the way yours are doing. I have some longer ones that latch up fine but I haven't had a chance to shoot them yet.
Have fun.