Have you considered calisthenics? Kind of a cross between the two.