Yeah, I like the cleaner version there, kudos for going with that one! I tested a bit with your previous design, and this new version should pay swimmingly, no doubt!
I tested a single match with my new version, and {1}{w}{w} is actually the correct cost I think! You're bricking quite often...