I think the switch is good. It gets the gold cannon in a better position for attack, because it doesn't have to jump over the RS anymore. It also works to my advantage a bit in this game because the RS is now in a better position to defend my offensive pieces.
I'm not entirely satisfied with the arrangement of the front pieces either. I think that either the lance needs to move back or be put in front; perhaps even in front of the pawn (in which case the pawn would move back a square or two).
So something like this:
-(centre)
-
-
L
P
-
-
Kn
N
-
Gs
-
GC
RS
-
C
K
Unfortunately, this extends the board even more (to 33 squares) and it sacrifices some spacing further back. I haven't examined it very thoroughly, so maybe it doesn't solve any problems, but it's an idea.