I bought a Banggood 0 - 30V PSU kit so that I could at least have something better than an old ATX psu to use. Looking at the components, the 3A rating is rather generous, so I am looking to beef it up a bit to at least get the 3A safely, and maybe get 5A - 6A. Maybe this is folly and I should just accept that 2A is a more reasonable spec, but where is the fun in that

Here is the item:
http://www.banggood.com/0-30V-2mA-3A-Adjustable-DC-Regulated-Power-Supply-DIY-Kit-p-958308.htmlSchematics and parts list are here:
http://img.banggood.com/file/products/201505080459530-30Vinstall.pdfSo here are my thoughts for changes. I'm looking for things I may have missed, traps for new players, or any reason this whole idea is shear folly. I have my eye on a 24VAC 80VA transformer, but if I can beef up the current capabilities, I may go larger.
1) The rectifier diodes have a max rating of 3A (1N5408) so upgrade these to 6A or 8A diodes (recommendations? I'm looking at this
http://www.allelectronics.com/make-a-store/item/p600m/6-amp-1000-volt-rectifier/1.html)
2) Q4 (2SD1047) move off board to a good heat sink. It has a max of 12A, so should be OK at 6 if I can keep it cool. This is an area of concern about beefing this thing up. Can I dissipate the heat? I'm thinking of using a CPU cooler with a fan
3) The shunt resistor R7 (0R47 5W) is near its max rating at 3A (~4.5 watts). I can replace this with an aluminum case resistor, and drop the value to get more current limit adjustment range. 0R25 I think should get me in the ball park of 6A adjustment range. Also move off-board.
4)Beef up the traces for the main current path by piggy backing some wire along the traces
5) Add a fuse
Would I need to increase C1 and/or C7? (main input and output caps, respectively). If C1 needs to be doubled (second cap) I think I would need to move them off-board for the space.
I am thinking 16 guage wire for off-board connections in the main current path.
Any thoughts, concerns, tips are welcome. Even if I stay with a 3A max, I'm thinking a diode and shunt resistor upgrade would be a good thing.
Just for full disclosure, I am also planning to add an Arduino with LCD readouts for set amps/actual amps/volt/watts, and of fan for the heat sink, so I am conservatively allocating about 500mA for internal load. I have already done this on my DC Load project, so I think I know how to do this part already.
Thanks