I'd say the 21" inch frame should fit you better. But it's not inconceivable that you'd fit the 24" either.
You could look into a 29" wheeled bike too.