I don't see the point in replacing a stock radio with another stock radio. I doubt a stock radio will have all the accessories of the aftermarket radios. It depends on what you are looking for. If you are looking for Bluetooth, AUX front and back, GPS, USB, SD Card, DVD, CD, etc, I doubt any stock radio will have all of these capabilities.
I think you'll eventually want at least bluetooth in the near future, and probably more.
With that being all said, if you current radio is 1-1/2 din size, and the 07 radio is 1-1/2 din size, it should fit without modification to your dash. If the 07 radio is double din, then it won't fit without modification. Most Wrangler stock radio's are 1.5 din so you should be fine. But, I would check that the new radio is actually 1.5 din, and that your current radio is 1.5 din.