Brake upgrade

[Bane]

Now that I have Bluefin installed on my Edition30,I feel the need for better stopping power,but I don't have much more money to spend.
Can I just uprate the pads from OEM ones to something like Ferodo DS pads,or will putting on R32/S3 discs and pads be a better choice?
If I do go down the R32/S3 route,will I need to change the calipers as well,or will the original calipers take the bigger R32 discs with R32 pads or uprated original ED30 pads?
Any input would be most appreciated,ta.

[keano]

For r32 setup you will need the disks, pads and calipers (and hoses)
The small eddy setup with take neither the pads or bigger disks  

[Bane]

Cheers for the info.
Until I can afford the R32 setup,it'll have to be uprated pads and new discs for just now.

[Beddie]

I greatly improved my stock ED30 brakes with some new oem discs and a set of Ferodo DS Performance pads 

[Andy]

Keep looking on e bay as they do go cheap if your lucky,like me when I got mine