[iudqnolq]

Your setup sounds great. You might find it interesting that it's also very close to what 1Password does.

1Password apps store local state in an SQLite database. They then package up that database and encrypt it with your chosen master password and a randomly generated password. (The random password is only to protect users who picked a weak master password against a server breach, so it's stored in plaintext on your computer). That encrypted file is uploaded to their server.

There is also an android (and iOS) app. If you edit independently conflicts are merged.