yes, more wpf is always good
and generally, wm > if
i would either put both points in weapon mastery or even consider taking an extra point in shield. but it all comes down to playstyle.
p.s. try out the Arabian Cavalry Sword. it's extra reach is very nice, especially on such a large horse