look on ebay for lights, they do come up quite often, either new or second hand, yes you can use rivets for the p clips tho some folk either use self tappers(with sealant as a locking aid, or on some panels a small bolt /locknut, depends if you think you may want to move the pipework in future etc.
a BIG WELL DONE on your results, thats a great achievement, good on ya
andy