I hadn't checked the first point (I don't use that menu so....
). I can try. The second one is done, not completely, it's a boring task because it means to change actions into menu options and it's tedious, but I've tested it with a couple of options and it works). I think the first one can be easier.
Anyway, it's done into a new file, out of StandardActions, because it was hard for me to work with the other one
If you want I can send you my test now or after trying your first option.