Suzuki 2 Strokes

So I've been busy repairing and remaking connections on the wiring loom on my GT380 lately. I had great difficulty trying to work out why the indicators didn't work.
Despite new soldered connections and practically zero resistance in the wiring the brand new indicators would not flash. So I replaced the flasher unit with a new one and still had the same problem.
Eventually I stripped one of the new indicators and had a look inside. The spade fit bulbs inside were only 10w, not 21w as OE items were. After fitting a couple of 21w substitute test bulbs, the indicators flashed.

Moral of story: don't buy "universal" aftermarket indicators and expect them to work on your classic.
Now on order are a set of new 21w indicators.

They're all like that. Just change the bulbs.

That would be the obvious solution, but I've never seen 21w spade bulbs. I don't think you can get them that size.
I know standard bayonet fittings are readily available in various wattages including 21w, but have you ever come across the spade/blade type fitting in 21w?