To me that is a no brainer answer in that it has to be the 100mm f2.8
Don't get me wrong, the 50mm f1.8 is a good lens and the raynox is a good attachment but you are never going to beat a dedicated macro lens especially that canon one.
Unless I'm missing something in your question.