30 days is a good journey. You should take advantage of it. If you havent booked your flights yet, you might turn it around and fly into Zagreb and out of Podgorica. I only say that because this is a Croatia adventure for you and i thought it might set with your mind a little easier to break the boundaries at the end of your trip than at the begining.
I have been to Croatia a few times and to be honest with you, unless my goal was to chill on a beach a lot (which isnt an altogeather bad idea at my advanced age), I would have trouble staying busy in Croatia for 30 days. Good news, Bosnia & Herzegovina (BiH) and Montenegro are at your service. 4 to 6 days in BiH and 5 to 7 days in Montenegro would round out the trip nicely. Podgorica, the capital of Montenegro, has an airport that is at least as well connected as Zagreb. Its where I fly into when I go to Croatia or to Montenegro (I live in Budapest).
By they way, there are a couple of PADI places in Budva, Montenegro. I will be visiting one in May. I spent 20 years diving then went through a 30 year period when it ws forbidden ... time to restart .... means relearning so a resort course in Belize last year and another this year in Montenegro till i get the time to do it right. Still, it gets me wet.
I bet you have researched the heck out of Croatia so I will leave that one alone and just push the Montenegro and BiH extensions in PMs to you or the posts will get very long.