I think the strategy you're going with makes a lot of sense, and with the two changes you made it's way better than it's first rendition, but you still lose pretty hard against rain (and weather setups in general.) I think my recommendation here would be to use a weather check of some kind...