I too enjoy Florida diving (will be in Key Largo next weekend to dive).
You will enjoy Curacao (it will be better for non-diving wife than Bonaire, more for her to do)
If you ever get a chance to go on a specific only diving vacation, you should consider Bonaire.
Unlimited 24 hr diving is available.