Give 24/15 a shot, or 21/18. Also, the way things are atm, Weaponmaster isn't absolutely necessary. It makes the difference between 113 WPF (0 WM) and 156 WPF (6 WM) on a balanced build. It certainly helps, but those 6 points can be put into something else. 21/18 is a great build, and allows you to pump 3 into shield skill to approach archers - its definitely possible to put the sword away and pull it out when you're in striking distance. Try 24/15 out though, you'll be a monster, and definitely still have room for footwork.
If you're insulted by shield skill, max IF, and no weaponmaster, 18/21 is one of the best builds you can do in the game. You'll have 160+ WPF, thus adding to speed and damage in itself, and 7 athletics will let you take advantage of any situation imaginable.
3 IF
6 PS
7 Athletics
7 Weapon Master
The only drawback is you're a little soft, and it'll take an extra swing or two on heavy armored dudes. That's why I'd go 24/15, Max IF / PS, and shut everyone down in 1-3 swings. If you do that build, its 8 IF / 8 PS / 5 Athletics / 2 left over for shield. Don't pump Weaponmaster halfway, like 2 or 3 points, because it gets better and better at higher ranks, and will only give you a few extra points in the end otherwise.