CrossFit will help you develop other areas of your fitness (cardio, weightlifting) while developing your bodyweight strength as well. But if your goal is to only get better at bodyweight exercises following a calisthenics-based program is probably the best way to go.