Catalyst C2950 QoS Question

[doubleshot]

My company recently purchased some Catalyst C2950-24 switches. They are all running the SI, with IOS version 12.1(22)EA1b. We also, shortly after acquiring the switches, installed an IP telephony system (not Cisco, unfortunately). What I am trying to do is send the phone traffic to the expedite queue, and the rest to queue 3 of the wrr queue (given the most weight). I am new to Cisco products, and fairly new to networking.

Here is a quick overview of how I have set the switches up:
. All ports have a default CoS value of 7
. Ports with phones trust the incoming CoS value (6)
. Ports with phones that have pc's on the other side of
. them have the following command on the port:
. switchport priority extend cos 7
. Uplink and trunk ports are set to use pass-through mode
. mls qos trust cos pass-through dscp
. wrr-queue setup is listed below
. wrr-queue bandwidth 1 1 255 0
. wrr-queue cos-map 1 0 1 2 3 4 5
. wrr-queue cos-map 3 7
. wrr-queue cos-map 4 6

The questions I have are this:
1) should I be using pass-through mode, or keep trusting CoS values?
2) is the switchport command even necessary since these are not Cisco phones?
3) have I left anything out?

Here is a printout of the config on one of the switches:

!
version 12.1
no service pad
service timestamps debug uptime
service timestamps log uptime
service password-encryption
!
hostname Steelers
!
enable secret 5 $1$UfY4$fgXsU9oKd5JZFTEpF7Qi21
!
wrr-queue bandwidth 1 1 255 0
wrr-queue cos-map 2 0 1 2 3 4 5
wrr-queue cos-map 3 7
wrr-queue cos-map 4 6
ip subnet-zero
!
!
spanning-tree mode pvst
no spanning-tree optimize bpdu transmission
spanning-tree extend system-id
!
!
interface FastEthernet0/1
!
...<snip>
!
interface FastEthernet0/21
description PC Config Port
mls qos cos 7
!
interface FastEthernet0/22
description PC Config Port
mls qos cos 7
!
interface FastEthernet0/23
description John Doe
switchport priority extend cos 7
mls qos cos 7
mls qos trust cos
!
interface FastEthernet0/24
description Goes to server room switch
mls qos trust cos pass-through dscp
!
interface Vlan1
description Server room
ip address 192.168.100.200 255.255.255.0
no ip route-cache
!
ip default-gateway 192.168.100.3
ip http server
snmp-server community public RO
snmp-server location Server Room
snmp-server contact System Administrator
!
line con 0
exec-timeout 0 0
line vty 0 4
password <password>
login
!
!
end

I apologize for the long post, but wanted to include as much info as possible. Any help or tips would be greatly appreciated.