Got it all put together, hopefully its right.
Used the black sleeves for the pins, just pushed them through and out then removed the old boot. Put new boot in hole, then pushed the pin back into that.
I only had grooves on one side - the inner pads. Only used the abutment clips on those two pads. Everything seems okay and secure, but I'll check everything tomorrow after I drive it a bit.
The "paper clips" solution I found here: How to install anti-rattle clips, D30 brakes? - JeepForum.com
Not entirely sure how necessary they are, but I've got them on.