Free archetype rules are on, but the archetype feats ended up being decided upon before the class so I can't use that without starting over. I'd end up going Investigator otherwise for full martial proficiency with similar skill progression but I don't like its implementation in 2e at all....