Swords & Wizardry with Weapon Mastery?

I've got a game brewing and I think that I'm going to use Swords & Wizardry Complete as the base but sprinkle in some spice. The most potent being Mentzer Weapon Mastery.

It looks like the first thing to do would be to re-scope Weapon Mastery from 36 character levels to 20. Other than that, it looks straight forward.

Heck, in a way, S&W Complete's Fighter sort of provides a hook to WM's enumerated abilities through the parry maneuver.

I also think that a character sheet update is in order.