Above posts are all great. I think you might want a tad more PS because of the new lance changes. Regular lance is also a very good hoplite weapon imo (especially against other cav), a double use if you're on horse.
For 1hs, check whether you like long (italian, knightly), medium (dao weapons, cleavers), or short (axes, hammers/maces, picks). With short weapons, you have amazing accuracy hitting the opponent that you want, even in dense groups. I think you're already experienced with 1hs so it shouldn't be much of an issue finding a preference.
For shields, I like the fast ones, and just pick another shield up if it breaks. They have poorer coverage (except elite cav, but only on the feet), but are just much more responsive.
Level 31? If you're planning on leveling more, it is wise to plan ahead. 21/15 fills in quite fast, 21/18 sounds nice if you want to level further. I planned for 32, and just put random points in my last 3 levels. Don't want other people to experience the same.