I'd say go with the first list, I dont think having one razorwing is a very good idea since theres a decent chance it will get intercepted and blown up before it even does anything.
Now as far as the list goes I would combine the beast squads and put the baron with them, and then drop the hellions. Also lose the
ns on everything except maybe the warriors rides, and then drop the blasters from the warrior squads. That will give you enough points to get another kabal gunboat, razorwing, etc.