I think you are close but I would expect some negotiations trying to get it into the teens with listing it at $22k.
Just for a reference point. Bought my "new to me" 08' JKUR last year for just over $26k. 4DR, Auto, 65k miles, and close to $12k in upgrades (Lift, Armor, Axles, Lighting...