Shield: swapped the location of P1 with J2 and J4, to make it easier to
connect the hotend fan looms; removed chokes