Hi J.J,
I agree with your calculation in the non-clipping case, but in the "almost square wave" I think the calculation should be a bit different.
In both cases, one can use Vrms in the power formula P = Vrms^2/R, but in the square wave case, Vrms is the same as Vpeak, i.e. for a square wave...