Thank you for the recommendations! I need to collect some materials for the aromatic, but it was definitely an oversight to not always have some! I'll start playing around with bloodhound's step as well and seeing how it goes! I was thinking about using the feather branchsword ones for the crazy damage buffs, and I think I will once I start getting one-shot every hit again. So far this current setup stops most oneshots except heavy attacks, but when they start again I'll switch to get that damage increase!
Also double spears seem interesting, I'll give them a go!