My opinion:
trade the G22 for a G26 or G19 and also pick up a little .380
I got a G20 when I got my ccw pemit, I know the G22 is smaller but its the same size class. There is no way you will carry that thing all the time unless you are really dedicated or dont mind people seeing your gun.
I like the .40, but imo it doesnt really do anything a good 9mm cant do (for non-LEO self defense), it also isnt as easy to shoot in the Glock compact or sub compact platform, again, IMO.