I think moving away from the $usrdir and $homedir naming is a good idea, Im not 100% on the separation of the openenergymonitor directory and the emoncms directory but I cant also see a strong reason against it, so have decided to take your direction and make the change.
Update: Testing a full image build with the oem_emoncms_dirs development branch works great.