Apple, add variation to your build somewhat. You can add riding now, and shield later or vice versa. Adding variation definitely extends the longevity of your build and most likely the fun you'll have in certain situations.
Add riding: Congrats, you are two handed cav. Very fun class to play, but also hard because arrows hurt and you will be friendly with arrows. (And throwing lances... throwing lances seem to be popular as of late)
Add shield: Annoying arrows and throwing stuff(lances) begone. You can arrive to fights at 100% hp, most of the time, and also have access to a regenerative health bar. (picking up more shields after they break) Bring any sort of dagger with the shield, they are cheap, 0 slots, and you don't need wpf to use them. I recommend knife, or rondel, but any dagger works. To a smart player if you walk up to them with the shield and switch too late, they get a free hit. They also don't expect 2 handers to have a weapon behind the shield or the fact that you will stab them in the face if they try and get that free hit.
If you had any wpf, I would recommend throwing without a doubt. Throwing sucks when you start, but once you get used to it, it will be deadly. No need for throwing lances, that is excessive. 4 PT is enough to carry around heavy throwing axes, 5 for jarids. I recommend an absolute minimum of 4, a recommended dose of 5, and an even higher recommendation for 6. At 4 you hit people with good weapons, at 5 you hurt people with those weapons, at 6 you unleash the murder. (7 is overkill, but f- does it hurt to get hit by 7pt)
Either way, add something that will get more longevity to your build. You do not need to powergame and min-max all that, 21/18 is fine. Hell, 18/18 is fine.