Couldn't see the forrest for the trees :) Is this what you had in mind?
Yes, more like in the attached picture. Cut corners where you can. I also see no reason (there may be!) why not to increase the width of high-current tracks where you practically can.
I'd also turn J1 and C1 180 degrees to avoid that narrowing of the power carrying track between C1 and the IC, and dragged C1 a little lower to put its ground via in line with GND of J1 and the IC.
Then, I'd drag J2 a bit lower as well, again to improve the current return path, and, I think, rotate it 180 degrees too, so that its terminals are placed very close to the respective ones of C2.
Draw your return current traces *before* pouring copper on the ground plane :).
C2 and J2 could be moved closer to D1.
Also, routing using copper filled polygons is inconvenient, as it makes it difficult to rework when you move parts. It's easier to use traces (of whatever width is suitable), as they are dragged along with the respective footprints, but mainly because the layout looks much tidier with them. Polygons are fine, but they I think should be added when everything else is ready and only where you really need them.