It's likely if you do throw your design into the friis equation you'll see that after the first 30dB of gain, you don't really get any improvement in overall noise performance. For example if your mixer NF is 10dB and your RF gain is 30dB, then your mixer adds 0.039dB to the total NF. If your RF gain is 40dB then that goes down to 0.004dB. Hardly an improvement considering the extra difficulty in stabilizing the amp with that much gain.
And yes switching the power planes would certainly make a big difference. In fact I'm surprised it works at all with a solid pour directly below the signal layer. Your microstrips are going to treat that as a return path (regardless of whether it's ground of a positive supply), and that spacing is probably just a few mils. Are you using controlled impedance for the PCB?