The springs are the same on EDC and non EDC cars. Regarding rebuilding the strut, I've ask my BMW mechanic and he said it is possible, so I think your option 3 is feasible, if you can find the right part as you mentioned. Sorry can't help with that one.. Worst case, use the BMW original non EDC struts your obviously good mec. has ordered....