You're welcome man, anytime! Thanks for the rep
Also make sure when you ship this to take it apart as much as possible (tailcap off, lens not installed, batteries not in host) so if customs does inspect it they would have to assemble it, something they're not interested in doing. I believe your chances are much better this way instead of having them possibly open it and just press a button to see what it is.
One last thing I did too when I shipped internationally with strict import laws was sending it in 2 packages like you mentioned possibly doing. I sent out 1 package with the driver & diode - then
sent the 2nd package the following day with just the flashlight parts. This way both packages didn't hit customs at the same time which could possibly raise some curiousity on their end.
Good luck with shipping, this process worked perfectly for me when shipping through AU customs