I just replaced the AMK in our 2016 a few weeks ago.
Vendor was AutoHaus AZ.
The pump was something like $500 or so, very inexpensive and was a legitimate AMK.
BUT, the relay sent they sent was NOT compatible with the vehicle, it physically did not fit, and after ALOT of dinking around, I would NOT recommend replacing the shrouds with new ones. And be VERY detail oriented in EXACTLY how those shrouds fit in the space and up against the frame to get a reasonably tight weather "kinda resistant" fit. And don't even bother with the "parts" kit they send - it's incomplete - just be careful with what you have and keep everything clean.
Also, my 2016 was running Hitachi software but with an AMK pump - go figure....
You really should have an IIDTool to be able to confirm all the software, and to do the de-pressurize/re-pressurize and the height re-calibration. (But you can also cave man it and just go for it...)
And I recommend you get an 8mm, or was it 10mm? (I need to double check), "ratchet box wrench" if you don't already have one. it's possible with a normal box wrench but much easier with a "ratchet box".
I recorded it, and I will be posting the video, hopefully in the next week or so...