Ok, I've jimmed around with the cup-holder. Broke the stock metal tabs off the side, shaved the block on the underside, cut off the tips on the back (taking care not to trim too close so it doens't mess up the pull-out lock). I've got the stock brackets screwed on the sides, and it does look like it will bolt up fine.

New problem. Angle of the dash means that it won't fit anything larger than a 12oz can. So now I'm thinking I'd like to swap the location with the head unit. I know this has been done in the past, but does anyone have a write-up? I've seen where someone put the radio in place of the CD changer, and a LCD screen in the stock radio location. That's pretty much what I want to do, just with a cup-holder up top. Can anyone assist?