Beatles - about equal overall across the entire period - I think John started stronger though.
Solo - unfortunately John was cut off prematurely and had a long break; I started off liking John's albums more but on listening again felt they were both great (and also like George's and Ringo's output over that time) - so I guess I can't give a definitive answer just yet 
I will be listening to all the early solo stuff again in the coming weeks so will see if my perceptions have changed any since I last listened ...