It's a tough call. Game-forcing hands with 3-card support for partner's response are just hard to bid, in particular in standard-ish mehods. There are nice treatments available, including artificial meanings for jumpshifts/reverses, or Gazilli in this auction. But in a pickup partnership, you are stuck. With the kind of pickup partner you seemed to be having, I am not sure a jumpshift into a 2-card suit would work out that well. Obviously, 3H and 3S are out, being non-forcing. So in my opinion, it comes down to 4H or 4S. Between them, I kind of prefer 4S - seems more likely to work out. Moysian fits are not the end of the world, in particular if you have shortness with the short trumps.