You're right. To start with, I messed up the RMS conversion. But I oversimplified the design anyway. Since I'm obviosuly very rusty I googled it and came up with this, which agrees with what you say above. So I'm not sure where the 2 came from.
http://www.electronics-tutorials.ws/diode/diode_6.html