Hmm, as a 24 year old with no kids and a fairly straight up bringing (got disciplined in a fair way when naughty, rewarded when good) this is tough.
I would say that giving him the choice to man the hell up is a fair one. After so many warnings and "I told you many times before, please just do this 5 second job or your chores" it seems right that he gets a kick up the arse.
I think when and the way it was handled could have been better. Like someone said, he is acting like a typical teenager. If he has gone out with his friends thinking he is allowed to stay out all night - then to be be told he has forgot X,Y,Z (small things in his mind, big in yours because you told him 1000's of times) and has to come home at 9:30, is only going to get a bad reaction.
I would, in your situation, probably have given the same ultimatum and repercussions but had the delivery at a later time. You should have let him stay out as previously agreed and get home the next day. This would be the point to have planned out a better strategy/punishment and when he does arrive himself home after a good night out, you get medievil on his ass.
You could have also explained that you let him stay out and were tempted to ruin his night, but didn't. At which point you could have him do the chores instantly, some rent to be agreed and some form of no Xbox/Internet/TV. (You pay the electricity so you can control that).
The most important thing now as people have said, is to man up yourself and invite him around for a "chat". Make sure you lay it all down on the table including what will be the consequence if he doesn't do as you ask living under your roof. Build on your relationship with him, don't destroy it.
It sounded like he needed a taste of reality which you have possibly given him. Now is the time to work it out for the better with everyone involved.
Good luck, let us know how it goes.
(Ahh parenting, something to look forward too in much, much, much later life I suppose

)