It appears you've met the requirement. The x/c time (as you've detailed it above) counts. Now it might be a good idea to find a CFI that you want to use to get the "upgrade"; he or she can explain what else you need to do experience-wise.