Moto Z vs Moto Z2 Play

So I broke my Z's display yesterday by dropping it on the ground. The repair cost is making the Z2 Play very attractive to me. The battery size of the Z2 Play is not an issue for me because I have a battery mod (and the Z had a smaller battery anyway).

So what do you think? Is the camera on the Z2 Play comparable to the one on Z? I've really liked my Z's camera and the HDR feature. Does the Z2 Play shoot RAW?

Z2 Play has a 3.5mm jack which is a definite plus. I would not have a problem with adapters with the Z otherwise but they are very difficult to find here (Finland).

I've read the 626 is not an issue compared to the 820 except when running intensive games I assume? Is the Full HD noticeable compared to the higher DPI screen on the Z?

Z2 Play has 64 GB of storage compared to 32 on the Z.

Anything else I should know?