The diffuser lenses work well just take note of the paragraph about the lense being thinner. As it states though its eash enough to fix with a bit of tape. Here's mine:
Stripped the spot light tonight, no such wiring nasties in mine, some thermal epoxy might work well though. You'd need to get heat transfer from the inner housing though to the casing though.