Your derivation at http://www.wbabin.net/ajay/einstein.htm
looks fine to me...
And in my opinion the formula has been there for quite sometime now and I think the inappilcability of the generalization points towards some other kind of restriction which is occuring naturally.This restriction will give back to us our symmetrical and simple euation of
E=Mc^2.
Wish you all the best !!