If you are pleased with the laying performance of the caught swarm's queeen, I would recommend uniting the swarm with the original hive. This leaves you with a single hive with a young laying queen.
Reorganize the combs in such a way as to encourage building your unbuilt foundation (which will only take place if you've got a flow going on). Move the unbuilt foundation to either side of the brood area, with built frames closer to the hive walls. If it means taking out some built frames to give them room, you can save them for when needed on another occasion. This situation is one of those instances when having different sized frames presents an inconvenience.