Voltron,
I've been on both sides of this fence. I think that hourly has worked out better for me.......I like getting paid for my overtime. Make sure that the fringes and the raise more than compensate for the loss of OT. Otherwise you really didn't get a raise.

Good luck and congrats on the raise,

GJ