Yeah, those two are your best choices, though there are some farming sims that also have combat but don't seem nearly as good or as fun, though there is one unreleased farming sim that looks really damn cute and seems to have combat and some RPG mechanics in it coming out in the future:
Looks like it will take a while to come out but Alchemic Cutie looks like it will decent.