This looks much better from a CoI and compactness POV. Main thing I would try is realigning the two Riverside districts differently. Try to follow the I-15 corridor south in one district.
I'm interpreting this to mean that Corona should be in the same district as Temecula and Hemet should be in the same district as Riverside (city).
Putting Corona with Riverside is fine, but with the alignment you have it's probably preferable to split vertically. Not a fan of pairing Corona with Moreno Valley for example. So yes, that would be my recommendation if you could make it work out.