The headlight in your first post looks a heck of a lot like the one off of an FZ-6N. You can find them on Ebay occasionally, but be prepared to pay through the nose.
It's an MT03 and from Europe. Note the passing light in the very top section. We have one we are installing on a customer bike. They are incredibly bright too.