I am facing nearly the same problem (only difference is, that I'm using TWRP).
As far as I gathered info currently there is no(????) other way to update to a newer version of the ROm without going the dreaded "format data" step every time.
To all the experts here: Did I miss a point (please...