Welcome to SRP!
Sounds like you are doing great!

I reckon you have what will be needed and then some to maintain your edges.
If it were me who had to choose, I would use the barber hone for now....