[Egil]

I'm still off the opinion that the jail system can remain as it is as long as the areas where SL2 is sorely lacking (plot progression in general, villains, etc) are worked on. However, if those areas aren't addressed, then yeah I think your solution fits nicely.