That weapon master is not going to make you swing hardly faster at all, the difference between my proposed 120 1h vs your 130 is not something you could notice if you tried.
Same thing with my proposed 140 Pole vs your proposed 144. There is no swing speed difference between them.
However, increasing your athletics, riding, shield and such all to 7 on the 18/21 build is good. The riding will make you noticeably faster, and 5 athletics vs 7 athletics is huge, and here is why:
Stepping into your swings will make you MUCH faster at swinging your weapon. You'll have a faster effective attack speed since you'll be able to step into your swings faster.
So yes, you want to swing faster? My 18/21 @ level 35 build will do that for you since you'll have more athletics. Your riding will be noticeably faster and maneuverable with 7 riding because riding does so much. AAANNNDDD you'll have 4 Ironflesh which you could never have had before!
I'd go 18/21 at level 35 for what you want to do. Have fun man.