Need clarificatin before applying for COS

Need clarification before applying for COS

Hi

I was wondering if someone can clarify a few points for me please.

I am planning to switch from PSW to Tier 2 General and I have been working for my employer for a year now. My job title is "Java Support Analyst" and my salary was increased from 18000 to 25000, 3 month ago, job description has not changed the reason for the higher salary is working shifts instead of usual 9.00 to 17.00. Two questions:

1. If I apply now would I get the points for switching from PSW to Tier2, eventhough my salary has increased 3 month ago? Or do I have to wait another 3 month before I apply.

2. In terms of job title, can I use Graduate developer which has minimum wage of 22300? My confusion is that PSW to Tier 2 without resident labour test rule says :
"You must have worked in the job you have now for your current sponsor for at least six months before you apply. You must also continue to work for your sponsor in the job you have now." However codes of practice for Tier 2 for Graduate developer says "This job function is used to classify all programmers and developers who essentially have less than six months commercial experience of programming. This includes new graduates in IT or related technology degrees." if I apply for switching from PSW to Tier 2 without resident labour test under Graduate developer will this be accepted? Or can it be rejected because I have worked more than 6 month (which is needed for claiming points under PSW to Teir2 route)? Should I use programmer instead?

Thanks