I just did Scotland, and it's still a great itinerary, despite the changes. I would choose it over Ireland. Having done both ABDs, I think that Scotland is a better value for your money.
That being said, it's probably a good idea to consider a few other things.
1. The Ireland trip is slower paced.
2. The Scotland trip has some early mornings.
3. Kids will love both, but probably Ireland more, as it's less stuffy Castles.
4. Castles abound in Scotland. Be sure you like them as adults too.
5. Ireland definitely seems to have more on your own time.
6. Scotland has better shopping.
7. The Castle hotel in Ireland is amazing.
8. Edinburgh is a better city than Dublin.