Some members here have stuck PM calipers on their rides, with many happy reviews. I've still got stock brakes on mine, no ABS and have to be careful not to lock the rear one up during panic braking especially when the road is wet.
2007's still had a rubber/metal front brake hose ( 2008 onwards had braided hoses as stock OEM !) Get a good quality braided steel brakehose and Lyndall pads. ( Make sure they're for a 2007 , 2008 and up are different )
Remember it's DOT 4 corrosive brake fluid , so be VERY careful with the refit and re-bleeding mate !! That's the well cheapest way to a real good brake on that model year bike Remember it's easy to lock that 21 inch front if you're not careful In my opinion you do not need a 6 pot caliper at $600 or whatever...