I'm naturally biased since I play this instrument, but what about the fiddle? It's challenging, but not (usually) to the frustrating point. It sounds like you play Irish music so this would work well. (And of course you can play many other types of music on it.) If you decide to try it, you may want to try to borrow or rent an instrument at first to see if you like it.