I have found the rivets on Amazon. A reviewer stated he used them on his zforce 800.

100Pcs Black Plastic Rivets Clip 8mm x 15mm x 21mm

https://www.amazon.com/dp/B00W9773HA/ref=cm_sw_r_em_apa_qw4uBbKDVRV3K

[2015 Z Force 800 53/Trail EPS]

Those are the ones we all use...however you should know that the OE CFM pushpins are 7.5mm where these are 8mm. They work fine just fit a little tighter...which sometimes isn't a bad thing.

If you want something stronger and a bit more elegant looking that still has the break-away feature then maybe well nuts are the answer. https://www.ebay.com/itm/RAWL-Well-Nuts-8mm-M4-10mm-M5-13mm-M6-Rubber-Wellnuts-Wall-Cavity-Wall-Fixings/171156415300?hash=item27d9b7a344%3Am%3Ampa-jhQ07UREgaBmxYiIFJA&var=470298377358&_sacat=0&_nkw=8mm+well+nuts&_from=R40&rt=nc&LH_TitleDesc=0%7C0

[2015 Z Force 800 53/Trail EPS]

I've been thinking about these screw-in pins. Could use just a battery drill and a basic push pin tool to remove. And you get a hundred for 8-bucks.

https://www.ebay.com/itm/100pcs-8mm-Hole-Plastic-Rivets-Fastener-Fender-Bumper-Push-Pin-Clips-for-Auto/262610929164?epid=1583286263&hash=item3d24d4c60c%3Ag%3AitcAAOSwoudbNSQS&_sacat=0&_nkw=8mm+body+pins&_from=R40&rt=nc&_trksid=m570.l1313

https://www.amazon.com/QMET-Plastic-Fastener-Remover-removal/dp/B0734VKNYK/ref=sr_1_5?ie=UTF8&qid=1532307305&sr=8-5&keywords=Push+Pin+Tool